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 E887214D431; Tue, 10 Sep 2024 10:02:29 +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=1725962550; cv=none; b=DZLUO7MTYJosPJb+brl/vgR1lLfc4A2werLpE+lJol6e4mp29ReigKurS5IhduWtILlxJKwMtQdJSKa6QSHsTHHNT4bcBjG5F5oISiDVn8q1dl4QOLvxR+u/dA/VqChvdBJt6GyoLqOzhQOc1ZR2G+I7yViniE7bwPDag7wnw+U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725962550; c=relaxed/simple; bh=9VuAzwegBgxkPbmHkmBOYSyXFQR0R7H8iMfNbYPQ/Eo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J22Vvv1l1XDfNx38SVPswFR5Rz15MF94hcZOLG4xFoCrWBgj0GjHFgdP3rl/0fjH4jrjaIXcbz7gLva9yNsWYRZ6TQWsgxtyyrabuZWFZ7BeiWjimUmhmHJnptzrWQM/wigUOW9hTqfMiWeCOlCr3JHzvVaLhLD39XsZSJoUNF0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Jko4v4Gz; 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="Jko4v4Gz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66BFDC4CEC3; Tue, 10 Sep 2024 10:02:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725962549; bh=9VuAzwegBgxkPbmHkmBOYSyXFQR0R7H8iMfNbYPQ/Eo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jko4v4Gz/odYgLFBCdTDwTuGwJilHTBKd+zQ8TrDEL8TjnPrQW92wsCKv4iiZUxk9 d3TwXDbf06mrGv5vEuTtCN3eonQgZzXwGFi7/1Cw3oOp9e8/vo9y1Op/A+RIMVh4bE roJs++6lsuaj004gaBxKoNIQWABWq9Q+m+tyQjdY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Waiman Long , Tejun Heo , Sasha Levin Subject: [PATCH 5.4 072/121] cgroup: Protect css->cgroup write under css_set_lock Date: Tue, 10 Sep 2024 11:32:27 +0200 Message-ID: <20240910092549.303843427@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910092545.737864202@linuxfoundation.org> References: <20240910092545.737864202@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Waiman Long [ Upstream commit 57b56d16800e8961278ecff0dc755d46c4575092 ] The writing of css->cgroup associated with the cgroup root in rebind_subsystems() is currently protected only by cgroup_mutex. However, the reading of css->cgroup in both proc_cpuset_show() and proc_cgroup_show() is protected just by css_set_lock. That makes the readers susceptible to racing problems like data tearing or caching. It is also a problem that can be reported by KCSAN. This can be fixed by using READ_ONCE() and WRITE_ONCE() to access css->cgroup. Alternatively, the writing of css->cgroup can be moved under css_set_lock as well which is done by this patch. Signed-off-by: Waiman Long Signed-off-by: Tejun Heo Signed-off-by: Sasha Levin --- kernel/cgroup/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 62a7a5075014..16ae86894121 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -1783,9 +1783,9 @@ int rebind_subsystems(struct cgroup_root *dst_root, u16 ss_mask) RCU_INIT_POINTER(scgrp->subsys[ssid], NULL); rcu_assign_pointer(dcgrp->subsys[ssid], css); ss->root = dst_root; - css->cgroup = dcgrp; spin_lock_irq(&css_set_lock); + css->cgroup = dcgrp; WARN_ON(!list_empty(&dcgrp->e_csets[ss->id])); list_for_each_entry_safe(cset, cset_pos, &scgrp->e_csets[ss->id], e_cset_node[ss->id]) { -- 2.43.0