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 0DEFF1CCB32; Tue, 8 Oct 2024 12:45:17 +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=1728391518; cv=none; b=rtzAnFWW6uQi/VbCI4TBLJrN26+CvL2kjald1huO6X79QGdHLL0uCeiIkGbxxV63hzgc+JTwAZSC0guWmyWwb/VpzqQgIM5dURTJV6qbC/QFXAIr9dFX5K7Xkk5cU4LIcTCDLUhNvrfuuuutLkqEuL81AHzpVRxEsUDOAqJ/bxk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728391518; c=relaxed/simple; bh=OT7c79mdBNPrPQCO08MxxG5HH4GuOXV6lAdL/tDvi50=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gtXy4cW7U8Lq+tUEC9cxoVvQWfn1HcQfHMydgUlcZsELlgXHU/lSgSmhydHs8pBpSK1JSSQpeBVbrBvKB7IjRjPGPF5ot3aGb83OOm5fcNBgTKQ/9JCMauPSBsAaiYlicAbUkB7716IMcUoIfw6Y98IkeQV/UnjADZoqG1/B+eY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EWEmMeG4; 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="EWEmMeG4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3415AC4CECD; Tue, 8 Oct 2024 12:45:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728391517; bh=OT7c79mdBNPrPQCO08MxxG5HH4GuOXV6lAdL/tDvi50=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EWEmMeG40l4kiaHqR6i+TVDkV7SznQ4EsqAUA4b9kXI8zmxaSiIrPSAvH5gEdJBiz yXqUBDriAqGmnaVlGBOHxZ8TxMRslcMTwj071dnud7PhAtyxglQxuhihyZf4p3jV4C v1XZuer2fBYVTqu14Pp9PbO/C9uya9rJDhjHLN5k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vinicius Costa Gomes , Dmitry Antipov , "David S. Miller" , Sasha Levin Subject: [PATCH 6.11 107/558] net: sched: consistently use rcu_replace_pointer() in taprio_change() Date: Tue, 8 Oct 2024 14:02:17 +0200 Message-ID: <20241008115706.579246599@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241008115702.214071228@linuxfoundation.org> References: <20241008115702.214071228@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 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dmitry Antipov [ Upstream commit d5c4546062fd6f5dbce575c7ea52ad66d1968678 ] According to Vinicius (and carefully looking through the whole https://syzkaller.appspot.com/bug?extid=b65e0af58423fc8a73aa once again), txtime branch of 'taprio_change()' is not going to race against 'advance_sched()'. But using 'rcu_replace_pointer()' in the former may be a good idea as well. Suggested-by: Vinicius Costa Gomes Signed-off-by: Dmitry Antipov Acked-by: Vinicius Costa Gomes Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/sched/sch_taprio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c index cc2df9f8c14a6..8498d0606b248 100644 --- a/net/sched/sch_taprio.c +++ b/net/sched/sch_taprio.c @@ -1952,7 +1952,9 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt, goto unlock; } - rcu_assign_pointer(q->admin_sched, new_admin); + /* Not going to race against advance_sched(), but still */ + admin = rcu_replace_pointer(q->admin_sched, new_admin, + lockdep_rtnl_is_held()); if (admin) call_rcu(&admin->rcu, taprio_free_sched_cb); } else { -- 2.43.0