From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 285C1217707; Sun, 26 Jan 2025 15:03:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737903799; cv=none; b=UEB41nUv3AaMheqccU27tAPnXTPVmNlWrp2FHRqvzds8s3f82Ig2jzGULrmfLhQES4FdhJw+QxKXXeBiCtEcU7vVx96rp5W38mgbgccxS/xC7de6sowbEGgMw/16WFKHRJPxwoZfa7uEuO5ig3zwh5VYGheaQD5osLtKcsr5yQI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737903799; c=relaxed/simple; bh=CFWENkclnQkkNIgbz0yJqrbb08YbW0tTy5wBBl30SNM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JWRQRL66oXt+mZpTWgJkBta/Pj74qxA5g234NRKtWvZrH5rEL0CuFkd0XevAG5YPvrZWmn038x4gBo6qbdOLabl2XvVSqHmKuB7FczA/Nx8sthZeDIE02va6ZFjiygGRg3GsEwnQCqH221/fZtU2Ff6pO+wQYZ0EEADBpoWZQs4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lA4rPEib; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="lA4rPEib" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9CD5BC4CEE4; Sun, 26 Jan 2025 15:03:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737903799; bh=CFWENkclnQkkNIgbz0yJqrbb08YbW0tTy5wBBl30SNM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lA4rPEibvsouOilc9v5csap9l0hbM3bdTcml9tyPG45+qsRbbzA10qOg6kDQv1M+a aP1LFPprEbSomJmb9vndRmUwIjQmr7ziEqzYLhlgTfWv2EYIIFq3LoFvgBDAh90tHe HiigpPURSBtLyL9Bk61qyo7+Mfd0HACxOr98sQi+8ePcrscEfgGZjV7KWaC4FdX+z2 F56Gc/Of4BcZ12yQuKkbrkkXuFP1pdUD0frY7ssYIk8JcqMkxbsRIA1oGLC3q3QnUp fAFOSw4LlaGZaTHRAdp8/8LxzOw/MA5DofSQU+0emgo7N1XExqodPgwEW/quJqr/o5 PdYUK6U9Gc7lg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stas Sergeev , Willem de Bruijn , Jason Wang , Jakub Kicinski , Sasha Levin , willemdebruijn.kernel@gmail.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 02/19] tun: fix group permission check Date: Sun, 26 Jan 2025 10:02:57 -0500 Message-Id: <20250126150315.956795-2-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250126150315.956795-1-sashal@kernel.org> References: <20250126150315.956795-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.74 Content-Transfer-Encoding: 8bit From: Stas Sergeev [ Upstream commit 3ca459eaba1bf96a8c7878de84fa8872259a01e3 ] Currently tun checks the group permission even if the user have matched. Besides going against the usual permission semantic, this has a very interesting implication: if the tun group is not among the supplementary groups of the tun user, then effectively no one can access the tun device. CAP_SYS_ADMIN still can, but its the same as not setting the tun ownership. This patch relaxes the group checking so that either the user match or the group match is enough. This avoids the situation when no one can access the device even though the ownership is properly set. Also I simplified the logic by removing the redundant inversions: tun_not_capable() --> !tun_capable() Signed-off-by: Stas Sergeev Reviewed-by: Willem de Bruijn Acked-by: Jason Wang Link: https://patch.msgid.link/20241205073614.294773-1-stsp2@yandex.ru Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/tun.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index cbb2f78ffde03..c84a749c52d12 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -574,14 +574,18 @@ static u16 tun_select_queue(struct net_device *dev, struct sk_buff *skb, return ret; } -static inline bool tun_not_capable(struct tun_struct *tun) +static inline bool tun_capable(struct tun_struct *tun) { const struct cred *cred = current_cred(); struct net *net = dev_net(tun->dev); - return ((uid_valid(tun->owner) && !uid_eq(cred->euid, tun->owner)) || - (gid_valid(tun->group) && !in_egroup_p(tun->group))) && - !ns_capable(net->user_ns, CAP_NET_ADMIN); + if (ns_capable(net->user_ns, CAP_NET_ADMIN)) + return 1; + if (uid_valid(tun->owner) && uid_eq(cred->euid, tun->owner)) + return 1; + if (gid_valid(tun->group) && in_egroup_p(tun->group)) + return 1; + return 0; } static void tun_set_real_num_queues(struct tun_struct *tun) @@ -2778,7 +2782,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) !!(tun->flags & IFF_MULTI_QUEUE)) return -EINVAL; - if (tun_not_capable(tun)) + if (!tun_capable(tun)) return -EPERM; err = security_tun_dev_open(tun->security); if (err < 0) -- 2.39.5