From mboxrd@z Thu Jan 1 00:00:00 1970 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 B36473CB2D5 for ; Tue, 21 Jul 2026 09:15:06 +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=1784625308; cv=none; b=qPmeoxLWFN1oKYXI2//7b6kRuZ7kCqUc85OJlUIedXXniJ+1dkQn7pgZqm70TvlvvXQ83TiZFWAAlj5Cyfknts3lQedD+bAoOUMoa1oy3DYZIjFZ0rzwAlQP5id7RZcloekt/YptHoJ0j4uB2xg6hvfE7U7pn9z+eEXIzButU9k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784625308; c=relaxed/simple; bh=+OS/1AXhHyq84O3y+UuyF+UMWCVEBQunHe/BGeHd9zA=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=rFHm1fmpvmZHRCzIvrEAAsxKpRGeSNukeizA8HY17Oz02nrKhSz/6y7ugqeX2r4dxSCKK/gsQNMbviImG6sPASS/Zfn4Oo1M4ht8q7nuTWB8nks43tzr2cK7v+H21hXxEnVOs1jVXuQeMiyWPi7SwRG5Hvhcd3MMhLf4yl+CQ2M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fGAVb0g4; 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="fGAVb0g4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 253591F00A3E; Tue, 21 Jul 2026 09:15:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784625306; bh=WteP+PBAApj7fmxjqR40GnQejHlMMbialKhsq2WeF/Y=; h=Subject:To:Cc:From:Date; b=fGAVb0g4P5z706sEmtNjre7CsKKfC672GinOMKfgwC30+7ILXURsW5FqcniK5NwQt PfQLg8vGiOlGtyMfqFUUa+F8VPfCIev59+E12H6itfTlH37fFGkDTqfkFRQFxS5CTE IDdVJnzi36aslJIs6xTHWRxeqCv7GxWpw79pUrgA= Subject: FAILED: patch "[PATCH] net: macb: drop in-flight Tx SKBs on close" failed to apply to 5.10-stable tree To: theo.lebrun@bootlin.com,nb@tipi-net.de,pabeni@redhat.com Cc: From: Date: Tue, 21 Jul 2026 11:14:42 +0200 Message-ID: <2026072142-acorn-watch-76da@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 27f575836cfebbf872dec020428742b10650a955 # git commit -s git send-email --to '' --in-reply-to '2026072142-acorn-watch-76da@gregkh' --subject-prefix 'PATCH 5.10.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 27f575836cfebbf872dec020428742b10650a955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Lebrun?= Date: Thu, 2 Jul 2026 17:37:02 +0200 Subject: [PATCH] net: macb: drop in-flight Tx SKBs on close MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The MACB driver has since forever leaked the outgoing SKBs that have not yet been marked as completed. They live in queue->tx_skb which gets freed without remorse nor checking. macb_free_consistent() gets called in a few codepaths, but only close will trigger the added expressions. In macb_open() and macb_alloc_consistent() failure cases, queues' tx_skb just got allocated and are empty. Fixes: 89e5785fc8a6 ("[PATCH] Atmel MACB ethernet driver") Cc: stable@vger.kernel.org Reviewed-by: Nicolai Buchwitz Signed-off-by: Théo Lebrun Link: https://patch.msgid.link/20260702-macb-drop-tx-v4-1-1c833eebdbc8@bootlin.com Signed-off-by: Paolo Abeni diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index fd282a1700fb..d394f1f43b68 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -2668,8 +2668,25 @@ static void macb_free_consistent(struct macb *bp) dma_free_coherent(dev, size, bp->queues[0].rx_ring, bp->queues[0].rx_ring_dma); for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) { - kfree(queue->tx_skb); - queue->tx_skb = NULL; + if (queue->tx_skb) { + unsigned int dropped = 0, tail; + + for (tail = queue->tx_tail; tail != queue->tx_head; + tail++) { + if (macb_tx_skb(queue, tail)->skb) + dropped++; + macb_tx_unmap(bp, macb_tx_skb(queue, tail), 0); + } + + queue->stats.tx_dropped += dropped; + bp->dev->stats.tx_dropped += dropped; + + kfree(queue->tx_skb); + queue->tx_skb = NULL; + } + + queue->tx_head = 0; + queue->tx_tail = 0; queue->tx_ring = NULL; queue->rx_ring = NULL; }