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 0BCCC34E74B; Wed, 3 Dec 2025 16:56:12 +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=1764780973; cv=none; b=H35NsrlBuJbQ1CN63hYu9fQu120h80o6wIq4W/FVWZoaj5UHfMIqizBcAg6MwPES0D8xH6ZAQ7sLlXv0QDntP7o92N6TGZgbbyM2WtQcFakHqf35fDRWTvRVf4Ifmc8jua3QWWYj3BjJvtIho2QBjtdRdxTjGTGWd5/kWG9Fcx8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764780973; c=relaxed/simple; bh=XMEjew+5B+vsAj2AmQjb1xC442fTaRQxPNXPIks4Pqw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o12zd5vD7WNmLPQIaWklWgrVenIZ/8R32RNYaESNq2Z1gQUlxtIqUtiWQxJxDbnao83/oVJnzvd3BZ/J/wahk/0XOG990REMHCyFtp5DQujzQpFqOzOI1ndlS4egr5jqWIGzgeZiQN619rutYWvl4fkKd47YHYWXIn3XoUn2ZGY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Y/0yOPBj; 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="Y/0yOPBj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17705C4CEF5; Wed, 3 Dec 2025 16:56:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764780972; bh=XMEjew+5B+vsAj2AmQjb1xC442fTaRQxPNXPIks4Pqw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y/0yOPBjYafsDw3Y7AVAb/DtCUIk6sroj5IjNjYHdbnHm3JtuXtktOurlBzCj3Gja tq4GKe18qo4/fSjZypvSv+Z2VHXFkXn9QLPjQn3q6mETF5VlhZeaLKSlHd0dxpYuFh xEM4Tdb/YjH4LTW5GwTyZ0sQ16nZor+M4fTYZt+8= 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 6.6 12/93] net: sxgbe: fix potential NULL dereference in sxgbe_rx() Date: Wed, 3 Dec 2025 16:29:05 +0100 Message-ID: <20251203152336.963270372@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152336.494201426@linuxfoundation.org> References: <20251203152336.494201426@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 6.6-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 71439825ea4e0..d662679c29832 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c @@ -1521,8 +1521,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