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 99213284693; Mon, 5 May 2025 23:17:06 +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=1746487027; cv=none; b=DbcCijp5RsNea/ZFpXFuZpuuaiUoiKE8Vbdl+OLufpuSnFElMBtC0XJbUu8O7gmhWI5moEfSETk/X23Yl8Y/vt3+e3rXbCUO+YlV9yl5gjzHH6aAufnh8d0wykHrdEENkVMMECawY4Hk+Ch7/VrLuux6B1xf7gfz0SSEnpPSnwU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746487027; c=relaxed/simple; bh=W2RIqzMqc3RTHkG4HiBFh6YguAn8M0Nu5SSkWxbQdkY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JlCWIpYW4Jd79D6IlRN1ogCE5gQLqMCCvr9UJrwKL1HA15WkYCfrQKh1fMpg6KaLaSaPH3KEaTcu32T9VFTpyl2pK2cwIPgfQwoSv1cKd7T0PhfatNvV/mChf5BmclQ7zaVALtTg4fzjV7sMw8kik52YNpyTWV09alTW69hgKZY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nEZixrKL; 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="nEZixrKL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84FF3C4CEEE; Mon, 5 May 2025 23:17:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746487026; bh=W2RIqzMqc3RTHkG4HiBFh6YguAn8M0Nu5SSkWxbQdkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nEZixrKLgT+f+Kptak3sdiJzFs7esKk3fVWiHHdImciFrrdvYb937Pnx6LtcEf5QP /yQNTTR8jMvuroSheI3nvx6SFuJzvsyvYV8YgXBcr7PKjF5RpsNCNZea0awNo5hdkj 9zElGfbXGBFnD+7XmMrSQoYXY96UZkhv9a4qpeP9s3nEl+LT5Sm6+eL85I42zBqm9T AzKprBLXOIwI6fkirprkmzfSrxtAPAkA5BcK5Gdfg3CW8gelq/J/VW69JHjmRMvV0m xmw9QCmr4U95HsQ6xoy/sRaMpmISCfYQd92ulfuSDmVECYrGziVewwf5ktcV4P22ul yRtcbZx4XiTkg== 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.15 116/153] smack: recognize ipv4 CIPSO w/o categories Date: Mon, 5 May 2025 19:12:43 -0400 Message-Id: <20250505231320.2695319-116-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505231320.2695319-1-sashal@kernel.org> References: <20250505231320.2695319-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.15.181 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 f6961a8895296..0feaa29cc0243 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