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 1AE862FB2CC; Mon, 5 May 2025 23:23:36 +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=1746487417; cv=none; b=S71F95jwdi9tCZaYcXpVv93Cbq8/1reg4xdldDZVGuU6F+lDIoMMZuIRPVzx94hETqjy84d+ETWfkH83o2Z9+GjRiXK4KT0WP2wmuy5KtQCUKjIPqkxTM7RcTnP2ERxu3LfYohdS1+Th7GQ8F7fhhGv2I5sUfdyb7BfV0WveTxo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746487417; c=relaxed/simple; bh=31I+S/M5tJ6eRYCf02wPqrnk8HED8sz8eEfZqSFVlP0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DU2kxPxUQ+Pq28O4iU1FoYNUt80MqWmyZwQv/IM9mAJB1CgKLF4mtuIld+QjD8KrlhcAs2iGsQPFyrrMi518BCaYOV+EjVYI+QGuH8+i2+thol8hJxbQKifHEW4hZC2Umlqklp3UkzwIRdW0OC/HM+1AuYI4I9Xh+U8rJzl8iy4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=W4RDRSok; 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="W4RDRSok" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00FE6C4CEEF; Mon, 5 May 2025 23:23:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746487416; bh=31I+S/M5tJ6eRYCf02wPqrnk8HED8sz8eEfZqSFVlP0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W4RDRSok2frPwJORUfwxmq3Auv8P47DoPC4hbke60GzQi/EoJApaa2PXhAA2BAcvd SEYu/Jfnv1LVhNEFTBl1nJO7YtYf5TmGEAvCldbJ4PufavF2QjrVf/BlhZJSE5oyf5 YNdVF3/fDCRt7rBwJ01vQNPV4j2GQ7hGzCmm68P767R1wO02HC9Coj0A+7SzdxwKik t4/U6b7v8HuIF9tQLP5pPwLujpUNpXungEfwVPPRMDM8RXwiEuWs6NrMwvXJF8i2hl 5nO4wftGLxy11LNT2l4Srtq8AwZsAZXXKj7N+VPPvtss+11vVDKbeOlUFGlbhaT3zZ /lg/AAwNY0Y7Q== 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 5.4 59/79] smack: recognize ipv4 CIPSO w/o categories Date: Mon, 5 May 2025 19:21:31 -0400 Message-Id: <20250505232151.2698893-59-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505232151.2698893-1-sashal@kernel.org> References: <20250505232151.2698893-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 5.4.293 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 ddb0a292802ef..526598b40b13c 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -921,6 +921,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