]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: sxgbe: fix potential NULL dereference in sxgbe_rx()
authorAlexey Kodanev <aleksei.kodanev@bell-sw.com>
Fri, 21 Nov 2025 12:38:34 +0000 (12:38 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 6 Dec 2025 21:24:55 +0000 (06:24 +0900)
[ 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 <aleksei.kodanev@bell-sw.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20251121123834.97748-1-aleksei.kodanev@bell-sw.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c

index 12c8396b6942dd716ecff7f329d6a2f4f71d431f..d2ba283f6123fba6c59acdfe059554f502aa052a 100644 (file)
@@ -1520,8 +1520,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;