From: Jeimon <jjjinmeng.zhou@gmail.com>
Date: Sat, 8 May 2021 03:52:30 +0000 (+0800)
Subject: net/nfc/rawsock.c: fix a permission check bug
X-Git-Tag: Ubuntu-5.4.0-81.91~215
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=378981f2efaea7f05fb4bd8de2400670b734459e;p=mirror_ubuntu-focal-kernel.git

net/nfc/rawsock.c: fix a permission check bug

BugLink: https://bugs.launchpad.net/bugs/1933369

[ Upstream commit 8ab78863e9eff11910e1ac8bcf478060c29b379e ]

The function rawsock_create() calls a privileged function sk_alloc(), which requires a ns-aware check to check net->user_ns, i.e., ns_capable(). However, the original code checks the init_user_ns using capable(). So we replace the capable() with ns_capable().

Signed-off-by: Jeimon <jjjinmeng.zhou@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
---

diff --git a/net/nfc/rawsock.c b/net/nfc/rawsock.c
index 23d5e56306a4..8d649f4aee79 100644
--- a/net/nfc/rawsock.c
+++ b/net/nfc/rawsock.c
@@ -333,7 +333,7 @@ static int rawsock_create(struct net *net, struct socket *sock,
 		return -ESOCKTNOSUPPORT;
 
 	if (sock->type == SOCK_RAW) {
-		if (!capable(CAP_NET_RAW))
+		if (!ns_capable(net->user_ns, CAP_NET_RAW))
 			return -EPERM;
 		sock->ops = &rawsock_raw_ops;
 	} else {