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 73D281CF5C6; Wed, 2 Oct 2024 13:33:59 +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=1727876039; cv=none; b=PAtv+y8TiADEMXjBSM543Os5n0y8jCmcW2rD9KuoLEWiau+GLneyteTaIfYzVj1JwDA/sYML9FyptFd8XKOjnkIdDlsXpYyNAyhWPzK9KPXG4B6jcspzmWoPewzRKeaRaoNl3DAlairhgIbxIaaxieuPUq6P5EWy77NPO3WLYTU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727876039; c=relaxed/simple; bh=H21YHBMtaa99EyqxYT8JD+j8SHI5xD5/CJzr6FP2LXs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MWkQNCVgHVS9tXDPcw++cEp9sbbUqWDq2ChBmzWmQY5LHf3nZpXmgvmrPEAIMs4t1kiLAgTG8Z3xondaUDqlCn0Po+YnF1ESH/ynQxx13VHCmIIsedCHwgwpaWsLC+UxxOpciYcZd4hDQEZhJSTP230aBBvrv9Uyr1viQ/PkW3Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wqyc/rfc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="wqyc/rfc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED392C4CEC5; Wed, 2 Oct 2024 13:33:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727876039; bh=H21YHBMtaa99EyqxYT8JD+j8SHI5xD5/CJzr6FP2LXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wqyc/rfcHyqYSpbUbIVW7iiaZvGb0/UpyZAsd4IvupQo3O6uQE1ecHVMWUHKm0j7f MRrbA2mmDKpwQmF8KrVyJePgUjkzGbsXXEgfWm6uSqJ4BNkdGJsENffnmaSlhTQzFZ a9LobptQTQ/dQx5Dz4NAWWpTlUYBBPonw85IyhFA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jiawei Ye , Casey Schaufler , Sasha Levin Subject: [PATCH 6.11 307/695] smackfs: Use rcu_assign_pointer() to ensure safe assignment in smk_set_cipso Date: Wed, 2 Oct 2024 14:55:05 +0200 Message-ID: <20241002125834.695722776@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125822.467776898@linuxfoundation.org> References: <20241002125822.467776898@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiawei Ye [ Upstream commit 2749749afa071f8a0e405605de9da615e771a7ce ] In the `smk_set_cipso` function, the `skp->smk_netlabel.attr.mls.cat` field is directly assigned to a new value without using the appropriate RCU pointer assignment functions. According to RCU usage rules, this is illegal and can lead to unpredictable behavior, including data inconsistencies and impossible-to-diagnose memory corruption issues. This possible bug was identified using a static analysis tool developed by myself, specifically designed to detect RCU-related issues. To address this, the assignment is now done using rcu_assign_pointer(), which ensures that the pointer assignment is done safely, with the necessary memory barriers and synchronization. This change prevents potential RCU dereference issues by ensuring that the `cat` field is safely updated while still adhering to RCU's requirements. Fixes: 0817534ff9ea ("smackfs: Fix use-after-free in netlbl_catmap_walk()") Signed-off-by: Jiawei Ye Signed-off-by: Casey Schaufler Signed-off-by: Sasha Levin --- security/smack/smackfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index e22aad7604e8a..5dd1e164f9b13 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -932,7 +932,7 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf, } if (rc >= 0) { old_cat = skp->smk_netlabel.attr.mls.cat; - skp->smk_netlabel.attr.mls.cat = ncats.attr.mls.cat; + rcu_assign_pointer(skp->smk_netlabel.attr.mls.cat, ncats.attr.mls.cat); skp->smk_netlabel.attr.mls.lvl = ncats.attr.mls.lvl; synchronize_rcu(); netlbl_catmap_free(old_cat); -- 2.43.0