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 0B480281363; Mon, 5 May 2025 23:03:26 +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=1746486207; cv=none; b=eqHkJqvJIt1nxYjeud35so9QY6auTuZj5v6OiZ5IsggH9um32VdyP+phONOuHmLFaPU88B/nbt9wtQblm3U61KENwa1YiZ/0ePJkT1z4fSE/R0lzwZTKGV5T+NycxmqB1I8fLXuWOgW/trampK0214ZRA4dW5rGURs00FFPbymQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486207; c=relaxed/simple; bh=ywp+pIIcgYByOUSKGeAyjlKlGwm8eSXEf/1ZjQIEgr4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lsA1KSSpCF5yx3g5tNdvnfNYzegSzfOyGDZVD6aUL83v+LP8sBOKHClYsntaD+ORAk6lKrzjgbI4rr81LDRuVYglCIC5akna4nCxZe6BSb+cSRhY3SOSxu3ruzsTVOpOwEB8xQgSzd7xbY2T8ESiEcYM5FkTbxJ3+agZKjg0WLg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=o0w09L1x; 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="o0w09L1x" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E230FC4CEE4; Mon, 5 May 2025 23:03:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746486205; bh=ywp+pIIcgYByOUSKGeAyjlKlGwm8eSXEf/1ZjQIEgr4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o0w09L1xcG6GJOcsuuM5PHjo1p0C7mwAtxqOOHZsj/3CAJEousc2a70rTSaqzNJPz qwM7Swhb/t/SxfPeOsxa5O+QX9+SVd2wePDkwgMo3EMGj1bymz4BtWz6gruwbChlv4 Vs7qznI9qX7SEkcJKb731VdFRiznRw9XF8LRJQi6os5L11UXW6QR8bTcVj0oZcRGXo +ONafTeeS/UEv8LLTMqciwFZ3HUpp3joYp2m0nKwE5g6xBvF1iCpXvggFAYgscqWh9 +gP1stqfQqNtJcq6tND9df64cviRuajI1FDTdtYpq/IfBWrhC/iEwclVqQbtuAZyQs tZ1Wr5vIieEXQ== 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.6 205/294] smack: recognize ipv4 CIPSO w/o categories Date: Mon, 5 May 2025 18:55:05 -0400 Message-Id: <20250505225634.2688578-205-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505225634.2688578-1-sashal@kernel.org> References: <20250505225634.2688578-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.89 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 5dd1e164f9b13..d27e8b916bfb9 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -933,6 +933,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