From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 96D06F419A0 for ; Wed, 15 Apr 2026 12:56:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=H6Fvhuo4DkldsPVDo20mT9bIWk6orSSbm77N0GIMwrE=; b=c8Bx64juWI4eKw7CmA6Sztavdh uGCRpbVIZFIOgl5d9+p2V9Aj1TlIMW+uA8+mEt2h+KfqENVdNxmGT6qAYaex4AW8AVFiL7RKQo8RE qop9r1XLYmoi5Xl6eJ7Llv3cBLY5wE8KjYZ9HRTKxECT+HytxPjTIU/QbGRRcu9zK7X9jthCIbs90 NbWG2kiNGzrEbjU50UI0XLkxqa1Xdd5MxHF4ELLJRCuqKGxi9HVhdf+vvG7m0bkhY+1avd3/MGH/H Qa7c2UyCa40X++B/MF7TVKGkDsBXI7U7H6chnTpAJdYMW2JdHvS6r46f+VU4BW/iZMLuZblLSs5jB 3bA3WvlA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wCznY-000000019fH-3ZtL; Wed, 15 Apr 2026 12:56:52 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wCznV-000000019eX-47iw for linux-arm-kernel@lists.infradead.org; Wed, 15 Apr 2026 12:56:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Sender:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=H6Fvhuo4DkldsPVDo20mT9bIWk6orSSbm77N0GIMwrE=; b=dWBpN9W92CDVnlfI9sNMjT5Nup JZZr7ViAfsir0I9K6wpLBymyIbaZrNqLVEncxmeoyrEmefVQx7IhCxsxsA5RA+PPZr1Vp7/tPot+/ CNq1cS1u1XN7i74+5/oWt2v3wIU+JnvA96qNZqXevQeFrcHyl4X+VDDYaJ6cxAeVdrkAaMG+we0FV ZXvq2uOOkLEjwBqqYmrl312E3o6thrmT8yV4ABjwsdjOte3koAReDrFLyf/P3jaVST3w0zHAYJura UxsOuj4rT/nTFDH/FrtIOzQmiXFoDo/SIH3tF+ckt/9k2qQ2dP1q+zdfdHxatZQjI9zf6Lt/ekFr+ ZkJ1enaw==; Received: from shell.armlinux.org.uk ([fd8f:7570:feb6:1:5054:ff:fe00:4ec]:36538) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1wCznH-00000000267-27zv; Wed, 15 Apr 2026 13:56:35 +0100 Received: from linux by shell.armlinux.org.uk with local (Exim 4.98.2) (envelope-from ) id 1wCznE-000000002ED-2SR5; Wed, 15 Apr 2026 13:56:32 +0100 Date: Wed, 15 Apr 2026 13:56:32 +0100 From: "Russell King (Oracle)" To: Sam Edwards Cc: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , Maxime Chevallier , Ovidiu Panait , Vladimir Oltean , Baruch Siach , Serge Semin , Giuseppe Cavallaro , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH net v5] net: stmmac: Prevent NULL deref when RX memory exhausted Message-ID: References: <20260415023947.7627-1-CFSworks@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260415023947.7627-1-CFSworks@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260415_055650_026548_AFD480DC X-CRM114-Status: GOOD ( 26.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Apr 14, 2026 at 07:39:47PM -0700, Sam Edwards wrote: > The CPU receives frames from the MAC through conventional DMA: the CPU > allocates buffers for the MAC, then the MAC fills them and returns > ownership to the CPU. For each hardware RX queue, the CPU and MAC > coordinate through a shared ring array of DMA descriptors: one > descriptor per DMA buffer. Each descriptor includes the buffer's > physical address and a status flag ("OWN") indicating which side owns > the buffer: OWN=0 for CPU, OWN=1 for MAC. The CPU is only allowed to set > the flag and the MAC is only allowed to clear it, and both must move > through the ring in sequence: thus the ring is used for both > "submissions" and "completions." > > In the stmmac driver, stmmac_rx() bookmarks its position in the ring > with the `cur_rx` index. The main receive loop in that function checks > for rx_descs[cur_rx].own=0, gives the corresponding buffer to the > network stack (NULLing the pointer), and increments `cur_rx` modulo the > ring size. After the loop exits, stmmac_rx_refill(), which bookmarks its > position with `dirty_rx`, allocates fresh buffers and rearms the > descriptors (setting OWN=1). If it fails any allocation, it simply stops > early (leaving OWN=0) and will retry where it left off when next called. > > This means descriptors have a three-stage lifecycle (terms my own): > - `empty` (OWN=1, buffer valid) > - `full` (OWN=0, buffer valid and populated) > - `dirty` (OWN=0, buffer NULL) > > But because stmmac_rx() only checks OWN, it confuses `full`/`dirty`. In > the past (see 'Fixes:'), there was a bug where the loop could cycle > `cur_rx` all the way back to the first descriptor it dirtied, resulting > in a NULL dereference when mistaken for `full`. The aforementioned > commit resolved that *specific* failure by capping the loop's iteration > limit at `dma_rx_size - 1`, but this is only a partial fix: if the > previous stmmac_rx_refill() didn't complete, then there are leftover > `dirty` descriptors that the loop might encounter without needing to > cycle fully around. The current code therefore panics (see 'Closes:') > when stmmac_rx_refill() is memory-starved long enough for `cur_rx` to > catch up to `dirty_rx`. > > Fix this by further tightening the clamp from `dma_rx_size - 1` to > `dma_rx_size - stmmac_rx_dirty() - 1`, subtracting any remnant dirty > entries and limiting the loop so that `cur_rx` cannot catch back up to > `dirty_rx`. This carries no risk of arithmetic underflow: since the > maximum possible return value of stmmac_rx_dirty() is `dma_rx_size - 1`, > the worst the clamp can do is prevent the loop from running at all. > > Fixes: b6cb4541853c7 ("net: stmmac: avoid rx queue overrun") > Closes: https://bugzilla.kernel.org/show_bug.cgi?id=221010 > Cc: stable@vger.kernel.org > Signed-off-by: Sam Edwards Locally, while debugging my issues, I used this to prevent cur_rx catching up with dirty_rx: status = stmmac_rx_status(priv, &priv->xstats, p); /* check if managed by the DMA otherwise go ahead */ if (unlikely(status & dma_own)) break; next_entry = STMMAC_NEXT_ENTRY(rx_q->cur_rx, priv->dma_conf.dma_rx_size); if (unlikely(next_entry == rx_q->dirty_rx)) break; rx_q->cur_rx = next_entry; If we care about the cost of reloading rx_q->dirty_rx on every iteration, then I'd suggest that the cost we already incur reading and writing rx_q->cur_rx is something that should be addressed, and eliminating that would counter the cost of reading rx_q->dirty_rx. I suspect, however, that the cost is minimal, as cur_tx and dirty_rx are likely in the same cache line. It looks like any fix to stmmac_rx() will also need a corresponding fix for stmmac_rx_zc(). -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!