Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 60C863FE67B; Tue, 21 Jul 2026 17:31:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784655096; cv=none; b=u+eZAUbDj3H0tgfRlQEO3mpSxxv2cIz55wJU8Cilu8cyNSTdFWB8PcMgj9k9vyagUV2jtNZJk6UZ5UsY/aHhjN9ZOfslnK9OX4VTVuf5VedbOXIGOCoQaj7gROrTJ3+HB8Ntafo97GTqn5iq2Azdn/jgFlg0ATlKNlgK15ZeUwo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784655096; c=relaxed/simple; bh=KHnsQr3m0bzBb7Itu8e+P7w1GCCwzXxQunwW7yL/yYU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QckSOZs0hT/DRyzu/GhXXVNZhc7IXqtAWLsknNQsAlPa6QJ8VAR87YZIgkO5iFOX3DhddWU4X+m9h8ki73l+xl79PiHe/T/pophK20jmn/vN877O80m/Fo6Wz8Nh3vfGsnlzEcmLiGmOfjV+ntvt2xOHDpCAib0AOoJOoWJHKrY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Kdxg6wUA; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Kdxg6wUA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6A7E1F000E9; Tue, 21 Jul 2026 17:31:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784655095; bh=zhfgfu9TkR0CYf+jJTt2ND7EmBIZP4xL+djgaft8AQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Kdxg6wUA4XzFqF+2m2imnKElUnwNZbUqtvSbnv+KpRqllNq831cnAqWTIeYDypHQV 4COs0rDbAT3v94FATAicAMxz+9q8Z9pLg2utunQ5ty7BnFipEv2V33GPKws0N397c+ fLRWK6PlvtsD6F96FMpaaq/37HQ8nWzf+3LFGQl4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vladimir Oltean , Bryam Vargas , Victor Nogueira , Jamal Hadi Salim , Jakub Kicinski Subject: [PATCH 7.1 1955/2077] net/sched: sch_taprio: Replace direct dequeue call with peek and qdisc_dequeue_peeked Date: Tue, 21 Jul 2026 17:27:08 +0200 Message-ID: <20260721152638.820895581@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152552.646164743@linuxfoundation.org> References: <20260721152552.646164743@linuxfoundation.org> User-Agent: quilt/0.69 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 7.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bryam Vargas commit e056e1dfcddca877dd46d704e8ec9860cfc9ec44 upstream. When taprio's software path peeks a non-work-conserving child qdisc, the child stashes the peeked skb in its gso_skb; taprio_dequeue_from_txq() then takes the packet with a direct child ->dequeue() call, which ignores that stash, orphans the peeked skb and desyncs the child's qlen/backlog. With a qfq child this re-enters the child on an emptied list and dereferences NULL, panicking the kernel from softirq on ordinary egress. Take the packet through qdisc_dequeue_peeked(), as sch_red and sch_sfb now do. The helper returns the child's stashed skb first and is a no-op when there is none, so a work-conserving child is unaffected and the gated path now consumes the skb whose length was charged to the budget. Fixes: 5a781ccbd19e ("tc: Add support for configuring the taprio scheduler") Cc: stable@vger.kernel.org Cc: Vladimir Oltean Signed-off-by: Bryam Vargas Reviewed-by: Victor Nogueira Acked-by: Jamal Hadi Salim Link: https://patch.msgid.link/20260625-b4-disp-31bcb279-v1-1-85c40b83c529@proton.me Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/sched/sch_taprio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/sched/sch_taprio.c +++ b/net/sched/sch_taprio.c @@ -749,7 +749,7 @@ static struct sk_buff *taprio_dequeue_fr return NULL; skip_peek_checks: - skb = child->ops->dequeue(child); + skb = qdisc_dequeue_peeked(child); if (unlikely(!skb)) return NULL;