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 4818D14A4C7; Wed, 7 May 2025 18:44:09 +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=1746643449; cv=none; b=JUwztj9HXuEewk9h/lyDngiuzZwT/tgpL7t52ogMtac7YLQ83PdcWFPPcNCgdm7E8Ray/jCRYu6WtR83C/1jPxqo13uWryANlmQ4WlFJMwBcc1QtFQERWetnNK+eIFRK73llkzjdIZeircW8zcnKxuzHbyn1GsuMRPTHHT4w81U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746643449; c=relaxed/simple; bh=brhfdMxz9g0FIgmcRaXm/DcUcveZ8VigOore48cNJA0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IPpAIblA8/6S8SGE/tuZ6rIX+8qVGt/xtVvFbvVOARTSrQdV9ChCaCqcwO9IamycU3uozWo8NrvYe5k3wqjJEzalWJsFpSgWgZM2U2e6s3W24GrtQHavcE2tT8VxEWG6nL+kosRLBSoDW7UpuADhvSUZioe8CxFVYyF8Q85cj+U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JQlFysDK; 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="JQlFysDK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AAA67C4CEE2; Wed, 7 May 2025 18:44:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1746643449; bh=brhfdMxz9g0FIgmcRaXm/DcUcveZ8VigOore48cNJA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JQlFysDKEFNMDv5wrXrWvPq2pcRxfsTZ3uLhLsebucg4wNyrpoXfJYBnNpjlNQiRz 0TLnXRuRNZd2khxzKfXWr9+t5CFs6GdwYqv8WZcGUcYL+YmmN46Jl3IMSeR2JdwLe2 FMuqRC9E0NtN0o229gL5RtZU3HUkOtJlhbJH/vT8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Gerrard Tai , Jamal Hadi Salim , Victor Nogueira , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 24/55] net_sched: hfsc: Fix a UAF vulnerability in class with netem as child qdisc Date: Wed, 7 May 2025 20:39:25 +0200 Message-ID: <20250507183800.015736493@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250507183759.048732653@linuxfoundation.org> References: <20250507183759.048732653@linuxfoundation.org> User-Agent: quilt/0.68 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.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Victor Nogueira [ Upstream commit 141d34391abbb315d68556b7c67ad97885407547 ] As described in Gerrard's report [1], we have a UAF case when an hfsc class has a netem child qdisc. The crux of the issue is that hfsc is assuming that checking for cl->qdisc->q.qlen == 0 guarantees that it hasn't inserted the class in the vttree or eltree (which is not true for the netem duplicate case). This patch checks the n_active class variable to make sure that the code won't insert the class in the vttree or eltree twice, catering for the reentrant case. [1] https://lore.kernel.org/netdev/CAHcdcOm+03OD2j6R0=YHKqmy=VgJ8xEOKuP6c7mSgnp-TEJJbw@mail.gmail.com/ Fixes: 37d9cf1a3ce3 ("sched: Fix detection of empty queues in child qdiscs") Reported-by: Gerrard Tai Acked-by: Jamal Hadi Salim Signed-off-by: Victor Nogueira Link: https://patch.msgid.link/20250425220710.3964791-3-victor@mojatatu.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/sched/sch_hfsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index 85c296664c9ab..d6c5fc543f652 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c @@ -1572,7 +1572,7 @@ hfsc_enqueue(struct sk_buff *skb, struct Qdisc *sch, struct sk_buff **to_free) return err; } - if (first) { + if (first && !cl->cl_nactive) { if (cl->cl_flags & HFSC_RSC) init_ed(cl, len); if (cl->cl_flags & HFSC_FSC) -- 2.39.5