]> git.itanic.dy.fi Git - linux-stable/commitdiff
sfc/siena: fix null pointer dereference in efx_hard_start_xmit
authorÍñigo Huguet <ihuguet@redhat.com>
Thu, 15 Sep 2022 14:19:58 +0000 (16:19 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Sep 2022 09:32:17 +0000 (11:32 +0200)
[ Upstream commit 589c6eded10c77a12b7b2cf235b6b19a2bdb91fa ]

Like in previous patch for sfc, prevent potential (but unlikely) NULL
pointer dereference.

Fixes: 12804793b17c ("sfc: decouple TXQ type from label")
Reported-by: Tianhao Zhao <tizhao@redhat.com>
Signed-off-by: Íñigo Huguet <ihuguet@redhat.com>
Link: https://lore.kernel.org/r/20220915141958.16458-1-ihuguet@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/sfc/siena/tx.c

index e166dcb9b99ceaa055a880f57785ee13bfb2a6f9..91e87594ed1eac18e8dbec04c9b29161a3ef0b54 100644 (file)
@@ -336,7 +336,7 @@ netdev_tx_t efx_siena_hard_start_xmit(struct sk_buff *skb,
                 * previous packets out.
                 */
                if (!netdev_xmit_more())
                 * previous packets out.
                 */
                if (!netdev_xmit_more())
-                       efx_tx_send_pending(tx_queue->channel);
+                       efx_tx_send_pending(efx_get_tx_channel(efx, index));
                return NETDEV_TX_OK;
        }
 
                return NETDEV_TX_OK;
        }