| Message ID | 20220915141958.16458-1-ihuguet@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 589c6eded10c77a12b7b2cf235b6b19a2bdb91fa |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] sfc/siena: fix null pointer dereference in efx_hard_start_xmit | expand |
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Thu, 15 Sep 2022 16:19:58 +0200 you wrote: > 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> > > [...] Here is the summary with links: - [net] sfc/siena: fix null pointer dereference in efx_hard_start_xmit https://git.kernel.org/netdev/net/c/589c6eded10c You are awesome, thank you!
diff --git a/drivers/net/ethernet/sfc/siena/tx.c b/drivers/net/ethernet/sfc/siena/tx.c index e166dcb9b99c..91e87594ed1e 100644 --- a/drivers/net/ethernet/sfc/siena/tx.c +++ b/drivers/net/ethernet/sfc/siena/tx.c @@ -336,7 +336,7 @@ netdev_tx_t efx_siena_hard_start_xmit(struct sk_buff *skb, * 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; }
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> --- drivers/net/ethernet/sfc/siena/tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)