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 480E72F10AF; Mon, 5 May 2025 23:11:43 +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=1746486704; cv=none; b=gyg1OKPkY4D5jYgPd1rv2smI9VqqMu4cGmkVJfWnsM2xyhc8I+KKVKW5bLy6E2jIJ9kW6di9/Ag8LCIw8TCihIu1X57QDVQmhhl2lhFkg41VSKluc83z2voFxJehRbo/rF5f01zR27oqPVwgHIR8gPtwcA8ASOaipJ4tP4zyDEM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486704; c=relaxed/simple; bh=25Ojv8klnLISHg0C6XQR3eGHdYQ0sMT0gShyf/sP9kI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=t9bR1Luu3AjKlpa44YYBsAVnmK78+mocdQ+RsaIOqWgY3sUKP/mmG6yeCayPQbiwhgTj/iEP+B4wvV7p7iJgfyltkJepY04vDdT0F/NQbffRynjD6rlqjy0Jl1P0JAloUe2SUciXsijQ1TQYryzv44eLGn1B68J1nOkIpGVpWoo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gF/t2CYV; 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="gF/t2CYV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21CF4C4CEE4; Mon, 5 May 2025 23:11:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746486703; bh=25Ojv8klnLISHg0C6XQR3eGHdYQ0sMT0gShyf/sP9kI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gF/t2CYVhkhn4fKiO0Pxf1Pc2/aGuFSK0oqL9YGLf4v/5SBwOsHU73H+wpQMGBEyD 9/C7WAmUgLAwuJrvNM9kF/5bOEknnKbP0Rc6Wpl1q070MWKNxWvTLKPmkeD/WA7ZLz GFvt1dAcI23x+1qBdpd+VlV1+iQRUWMh6wq62iLMWeGXwLBJehsF4lkFPqW+EJXKXp iJ926vu+iJ7umpaee+bglyJ9eoGyAanTEF6IM+UPotm3rThm0IMK4v3MPoKZKOjEVY gbstovfW2z/KLunx+GnRCcxGzms0mnT73oeTeAKHu3cpX2KyhYSKUKIW31szOrHIhg 5BVoyDIyQq7Yw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Konstantin Andreev , Casey Schaufler , Sasha Levin , paul@paul-moore.com, jmorris@namei.org, serge@hallyn.com, linux-security-module@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 161/212] smack: recognize ipv4 CIPSO w/o categories Date: Mon, 5 May 2025 19:05:33 -0400 Message-Id: <20250505230624.2692522-161-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505230624.2692522-1-sashal@kernel.org> References: <20250505230624.2692522-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@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.1.136 Content-Transfer-Encoding: 8bit From: Konstantin Andreev [ Upstream commit a158a937d864d0034fea14913c1f09c6d5f574b8 ] If SMACK label has CIPSO representation w/o categories, e.g.: | # cat /smack/cipso2 | foo 10 | @ 250/2 | ... then SMACK does not recognize such CIPSO in input ipv4 packets and substitues '*' label instead. Audit records may look like | lsm=SMACK fn=smack_socket_sock_rcv_skb action=denied | subject="*" object="_" requested=w pid=0 comm="swapper/1" ... This happens in two steps: 1) security/smack/smackfs.c`smk_set_cipso does not clear NETLBL_SECATTR_MLS_CAT from (struct smack_known *)skp->smk_netlabel.flags on assigning CIPSO w/o categories: | rcu_assign_pointer(skp->smk_netlabel.attr.mls.cat, ncats.attr.mls.cat); | skp->smk_netlabel.attr.mls.lvl = ncats.attr.mls.lvl; 2) security/smack/smack_lsm.c`smack_from_secattr can not match skp->smk_netlabel with input packet's struct netlbl_lsm_secattr *sap because sap->flags have not NETLBL_SECATTR_MLS_CAT (what is correct) but skp->smk_netlabel.flags have (what is incorrect): | if ((sap->flags & NETLBL_SECATTR_MLS_CAT) == 0) { | if ((skp->smk_netlabel.flags & | NETLBL_SECATTR_MLS_CAT) == 0) | found = 1; | break; | } This commit sets/clears NETLBL_SECATTR_MLS_CAT in skp->smk_netlabel.flags according to the presense of CIPSO categories. The update of smk_netlabel is not atomic, so input packets processing still may be incorrect during short time while update proceeds. Signed-off-by: Konstantin Andreev Signed-off-by: Casey Schaufler Signed-off-by: Sasha Levin --- security/smack/smackfs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index d955f3dcb3a5e..9dca3672d82b4 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -922,6 +922,10 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf, if (rc >= 0) { old_cat = skp->smk_netlabel.attr.mls.cat; rcu_assign_pointer(skp->smk_netlabel.attr.mls.cat, ncats.attr.mls.cat); + if (ncats.attr.mls.cat) + skp->smk_netlabel.flags |= NETLBL_SECATTR_MLS_CAT; + else + skp->smk_netlabel.flags &= ~(u32)NETLBL_SECATTR_MLS_CAT; skp->smk_netlabel.attr.mls.lvl = ncats.attr.mls.lvl; synchronize_rcu(); netlbl_catmap_free(old_cat); -- 2.39.5