From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f177.google.com (mail-dy1-f177.google.com [74.125.82.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC240344024 for ; Sat, 28 Mar 2026 19:25:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774725930; cv=none; b=G7olOoV8Has10Dy2FTBgQybOySIaSeM2vlWC7vefdxyoKRgx9DZiY5n+6flHqBm/U6k3kudBd4iOH7wR35PBZrOXXkeEsHrE5rNFH/wNMz9JffyKExJUrbDrZwKnNvPPweADQkzvrT0ZuZRDLI+mc83bl59BO+JKmYwSQ79LL/k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774725930; c=relaxed/simple; bh=Un+tjKghOnSOGQJqIv2n+A/mJ2xTSQ27PpNpWvuI/2I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iHVehu+TK0E1APYOyBax5PS1o8wF6qZrqOKdWMIwofXexpmPtCApl+vWtM11wqUwVQ8Tj9sYXBLZrGQLMC0MFlnyPr2fwXeMWikkCf40R1ImGs80ukz06+YFF/BlakseFaDl5OMyalwMTA+ez6usIxPyiuQ19TE7Ehk9tdYXzRY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gAZbrUuS; arc=none smtp.client-ip=74.125.82.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gAZbrUuS" Received: by mail-dy1-f177.google.com with SMTP id 5a478bee46e88-2c107ef474fso6381934eec.0 for ; Sat, 28 Mar 2026 12:25:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774725927; x=1775330727; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FLw+KspfNI17fHokU2DyOGE90apcIrKC40CCDarAeuo=; b=gAZbrUuSJ54fpPF/RPKat5pfBFs2D483Dvzo0TVyZKs9hyqZ44pnkSK20HBKAdRtWc 155DYKThHGQQy7e/iNIoUdZIMxMOs+fvmi2PNOjWQ4I9R11SlpfSbSh0IAS7aTxelpWp fIkybNHp6tvK715E27dQCvj4X/v5Cwd3mx279+j17JuRiYiA/Aw0LDf/+/W+yIwSdntH QyxpPGid9OR5tOhtgbDg301qjBevWUmMhXd3d9IsJvTUvyHzNH7fnINETVGi/JlvA59M ydw4+cHcvrI8hsdo6UKXHvRUev/Vcuo1Hq9gXjLFz8wPESBd2HmuiNdZGjvr01/DilyY qbmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774725927; x=1775330727; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FLw+KspfNI17fHokU2DyOGE90apcIrKC40CCDarAeuo=; b=kVj1+UfTtvaUqrFBNZ8NgwFHQJ1ICqdzlicvm68MdZlPinqIID3uxNj9cizjm/qIoI 361ik+7hvAmn/faQO9L5VyI10nRX3wQi+Af23B4fgHJfwaaMWwQJRnAA5fiHQLhGFO/G UhY0tlo91IEmMp+3X4Giq0zDCQ4vUvIVTf3sIe/ELcly94p4CQRK3ssqFSudsTizm9iN da4/haUmh1YZdfxJQGwECElRTtciHruf1WSa4Xl+PUnXGhv6CfTSIhz655ioNhMF/+27 VhLpFhU7eVgmcN5z4ULyar/pGViBkY3Sn3LOX4UyM9oXRGu29Uplp6L7w2r7yoBpYsvX cjtw== X-Forwarded-Encrypted: i=1; AJvYcCX4OXWH+jgoUJXE1zUd8RlkArL8JE40i0Wc+B0Y727SmUNVwApHakYXp0HRK6geG2S7Kq4jERU=@vger.kernel.org X-Gm-Message-State: AOJu0YxSeIuQibpgzaRu5siugiPHq8Y7xQsYQ/cYQsOtu21blo1G9eMJ HpHlPnG800s4hc3rn0UTvp5AxWoqjAR+h9tUMaOEqb3NTG6XPGKD1eZ8 X-Gm-Gg: ATEYQzyPk5NsSOn6XM9S52vRssyjbQBPZgswZJa1Y/qjAZgjHAuhyNtV2Qa4kc/pgwW dRPijHTjR+inOOyDlZ5vvesjC9TP+qrJbk8bKBoZmr3ta4ryl74VdEH/e4sVhEPGq/fXNq+pAk1 1HKeGJsRaVbA0KJ0m1Ukv8w3OXNP1V50Fej4xxDsyE9DQ92Tar/F2jthwtLoZV3tjlPMb7uQE8s PDUptasoVcFtxGmAdJ9GoP73ah6L8ztaYZL8kDbnR6qZIsMg3YglUZjhdXQpyHe7hXYfBVnyMdG PEg4CQorVb2TRClPX2JIi18IKMgpnZprWUCz9OV8FExdU5HIUHx73bwb7UJOdYiyMj8VUOFbqb9 J1Pgew6gex6qEhmIwoaeKZIsnAb6K2YuF37G1feQWRrWW+w8rImUshljvgya6N1AOsVGW7nHR8l +VKGXQR5GGt1mhZrBxUAbIbUhrw1l1uj01UPs/LnyAYknMSwEKG2yt82Ku X-Received: by 2002:a05:693c:3282:b0:2c0:c96a:a4db with SMTP id 5a478bee46e88-2c185d8e84emr3824454eec.4.1774725926850; Sat, 28 Mar 2026 12:25:26 -0700 (PDT) Received: from localhost (static-23-234-93-211.cust.tzulo.com. [23.234.93.211]) by smtp.gmail.com with UTF8SMTPSA id 5a478bee46e88-2c3c79722e0sm2905771eec.31.2026.03.28.12.25.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 28 Mar 2026 12:25:26 -0700 (PDT) From: Sam Edwards X-Google-Original-From: Sam Edwards To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Maxime Coquelin , Alexandre Torgue , "Russell King (Oracle)" , 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, Sam Edwards , stable@vger.kernel.org Subject: [RESEND PATCH net v3 1/2] net: stmmac: Prevent NULL deref when RX memory exhausted Date: Sat, 28 Mar 2026 12:25:02 -0700 Message-ID: <20260328192503.520689-2-CFSworks@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260328192503.520689-1-CFSworks@gmail.com> References: <20260328192503.520689-1-CFSworks@gmail.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 6827c99bde8c..f98b070073c0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5609,7 +5609,8 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) dma_dir = page_pool_get_dma_dir(rx_q->page_pool); bufsz = DIV_ROUND_UP(priv->dma_conf.dma_buf_sz, PAGE_SIZE) * PAGE_SIZE; - limit = min(priv->dma_conf.dma_rx_size - 1, (unsigned int)limit); + limit = min(priv->dma_conf.dma_rx_size - stmmac_rx_dirty(priv, queue) - 1, + (unsigned int)limit); if (netif_msg_rx_status(priv)) { void *rx_head; -- 2.52.0