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 6F52A343D62; Wed, 3 Dec 2025 16:13:51 +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=1764778431; cv=none; b=lnLKXk41g9fgB9OTZn1YMrONj1Pu2GaQ6hZPhzuMtdjBYNy6/VqY9s0qoWXIGR4wMaknC1qAP4SgTcI/IadVR+NyOxHN5Ckn9sqqeFfUvRkPvGm2vniKbgB/86MQRHNUf5rtBJoAIGGfLhiLLp8CT5hziOwTk97XeEuiLlOqqcU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764778431; c=relaxed/simple; bh=HbbMgggzUOR3biRo3EkbXmW0YF9mo6f9tLugQjBzGq4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nCDJrB+V26Z+6sWtfg0C1Im/5hqHvoCMsUm25vqyTJsvo08s1ymo3OSg7v1HQHdDzbvpzYpnbl1XyaBRp/VpV5o1beav/T9R46Kofey6ftwwlUxLBOM9KkzfxT8WmfHqV9OpFNZwujdg5plEsREiNE/CihSGFy5fIU/I7Q9D6tc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bB5Ii+Qu; 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="bB5Ii+Qu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D06C0C4CEF5; Wed, 3 Dec 2025 16:13:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764778431; bh=HbbMgggzUOR3biRo3EkbXmW0YF9mo6f9tLugQjBzGq4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bB5Ii+QuBRbZQNLITDLN54g9cQ2C1ynDC/Ovorf7o/lMYuhYGkMZE3/m07KERGfxU Ux9MRpLyuVRHXhWnUgqxuSpBJ5QdnBGo3HNEm8g1Znqt0zyJP+CtEsC6ikYp2hnosb puGrDfYA0dw1UUvCI5o+nEt5giOFdxusx5ur0/rI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alexey Kodanev , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 342/392] net: sxgbe: fix potential NULL dereference in sxgbe_rx() Date: Wed, 3 Dec 2025 16:28:12 +0100 Message-ID: <20251203152426.754461111@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152414.082328008@linuxfoundation.org> References: <20251203152414.082328008@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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexey Kodanev [ Upstream commit f5bce28f6b9125502abec4a67d68eabcd24b3b17 ] Currently, when skb is null, the driver prints an error and then dereferences skb on the next line. To fix this, let's add a 'break' after the error message to switch to sxgbe_rx_refill(), which is similar to the approach taken by the other drivers in this particular case, e.g. calxeda with xgmac_rx(). Found during a code review. Fixes: 1edb9ca69e8a ("net: sxgbe: add basic framework for Samsung 10Gb ethernet driver") Signed-off-by: Alexey Kodanev Reviewed-by: Simon Horman Link: https://patch.msgid.link/20251121123834.97748-1-aleksei.kodanev@bell-sw.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c index 1b415fe6f9b9f..1fe687b594f9d 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c @@ -1518,8 +1518,10 @@ static int sxgbe_rx(struct sxgbe_priv_data *priv, int limit) skb = priv->rxq[qnum]->rx_skbuff[entry]; - if (unlikely(!skb)) + if (unlikely(!skb)) { netdev_err(priv->dev, "rx descriptor is not consistent\n"); + break; + } prefetch(skb->data - NET_IP_ALIGN); priv->rxq[qnum]->rx_skbuff[entry] = NULL; -- 2.51.0