* [PATCH net] ixgbe: add NULL pointer check before calling xdp_rxq_info_reg
@ 2021-01-22 11:23 ` wangyunjian
0 siblings, 0 replies; 4+ messages in thread
From: wangyunjian @ 2021-01-22 11:23 UTC (permalink / raw)
To: kuba, davem
Cc: intel-wired-lan, netdev, jerry.lilijun, xudingke, Yunjian Wang
From: Yunjian Wang <wangyunjian@huawei.com>
The rx_ring->q_vector could be NULL, so it need to be checked before
calling xdp_rxq_info_reg.
Fixes: b02e5a0ebb172 ("xsk: Propagate napi_id to XDP socket Rx path")
Addresses-Coverity: ("Dereference after null check")
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 6cbbe09ce8a0..7b76b3f448f7 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -6586,8 +6586,9 @@ int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter,
rx_ring->next_to_use = 0;
/* XDP RX-queue info */
- if (xdp_rxq_info_reg(&rx_ring->xdp_rxq, adapter->netdev,
- rx_ring->queue_index, rx_ring->q_vector->napi.napi_id) < 0)
+ if (rx_ring->q_vector && xdp_rxq_info_reg(&rx_ring->xdp_rxq, adapter->netdev,
+ rx_ring->queue_index,
+ rx_ring->q_vector->napi.napi_id) < 0)
goto err;
rx_ring->xdp_prog = adapter->xdp_prog;
--
2.23.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Intel-wired-lan] [PATCH net] ixgbe: add NULL pointer check before calling xdp_rxq_info_reg
@ 2021-01-22 11:23 ` wangyunjian
0 siblings, 0 replies; 4+ messages in thread
From: wangyunjian @ 2021-01-22 11:23 UTC (permalink / raw)
To: intel-wired-lan
From: Yunjian Wang <wangyunjian@huawei.com>
The rx_ring->q_vector could be NULL, so it need to be checked before
calling xdp_rxq_info_reg.
Fixes: b02e5a0ebb172 ("xsk: Propagate napi_id to XDP socket Rx path")
Addresses-Coverity: ("Dereference after null check")
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 6cbbe09ce8a0..7b76b3f448f7 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -6586,8 +6586,9 @@ int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter,
rx_ring->next_to_use = 0;
/* XDP RX-queue info */
- if (xdp_rxq_info_reg(&rx_ring->xdp_rxq, adapter->netdev,
- rx_ring->queue_index, rx_ring->q_vector->napi.napi_id) < 0)
+ if (rx_ring->q_vector && xdp_rxq_info_reg(&rx_ring->xdp_rxq, adapter->netdev,
+ rx_ring->queue_index,
+ rx_ring->q_vector->napi.napi_id) < 0)
goto err;
rx_ring->xdp_prog = adapter->xdp_prog;
--
2.23.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Intel-wired-lan] [PATCH net] ixgbe: add NULL pointer check before calling xdp_rxq_info_reg
2021-01-22 11:23 ` [Intel-wired-lan] " wangyunjian
@ 2021-01-22 12:36 ` Paul Menzel
-1 siblings, 0 replies; 4+ messages in thread
From: Paul Menzel @ 2021-01-22 12:36 UTC (permalink / raw)
To: Yunjian Wang
Cc: netdev, intel-wired-lan, jerry.lilijun, xudingke, Jakub Kicinski,
David S. Miller
Dear Yunjian,
Thank you for looking at these issue.
Am 22.01.21 um 12:23 schrieb wangyunjian:
> From: Yunjian Wang <wangyunjian@huawei.com>
>
> The rx_ring->q_vector could be NULL, so it need to be checked before
> calling xdp_rxq_info_reg.
A small nit: need*s*
> Fixes: b02e5a0ebb172 ("xsk: Propagate napi_id to XDP socket Rx path")
> Addresses-Coverity: ("Dereference after null check")
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
> drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> index 6cbbe09ce8a0..7b76b3f448f7 100644
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> @@ -6586,8 +6586,9 @@ int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter,
> rx_ring->next_to_use = 0;
>
> /* XDP RX-queue info */
> - if (xdp_rxq_info_reg(&rx_ring->xdp_rxq, adapter->netdev,
> - rx_ring->queue_index, rx_ring->q_vector->napi.napi_id) < 0)
> + if (rx_ring->q_vector && xdp_rxq_info_reg(&rx_ring->xdp_rxq, adapter->netdev,
> + rx_ring->queue_index,
> + rx_ring->q_vector->napi.napi_id) < 0)
Unrelated, but I always wonder, if there shouldn’t be more logging for
the error cases.
> goto err;
>
> rx_ring->xdp_prog = adapter->xdp_prog;
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
Kind regards,
Paul
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Intel-wired-lan] [PATCH net] ixgbe: add NULL pointer check before calling xdp_rxq_info_reg
@ 2021-01-22 12:36 ` Paul Menzel
0 siblings, 0 replies; 4+ messages in thread
From: Paul Menzel @ 2021-01-22 12:36 UTC (permalink / raw)
To: intel-wired-lan
Dear Yunjian,
Thank you for looking at these issue.
Am 22.01.21 um 12:23 schrieb wangyunjian:
> From: Yunjian Wang <wangyunjian@huawei.com>
>
> The rx_ring->q_vector could be NULL, so it need to be checked before
> calling xdp_rxq_info_reg.
A small nit: need*s*
> Fixes: b02e5a0ebb172 ("xsk: Propagate napi_id to XDP socket Rx path")
> Addresses-Coverity: ("Dereference after null check")
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
> drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> index 6cbbe09ce8a0..7b76b3f448f7 100644
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> @@ -6586,8 +6586,9 @@ int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter,
> rx_ring->next_to_use = 0;
>
> /* XDP RX-queue info */
> - if (xdp_rxq_info_reg(&rx_ring->xdp_rxq, adapter->netdev,
> - rx_ring->queue_index, rx_ring->q_vector->napi.napi_id) < 0)
> + if (rx_ring->q_vector && xdp_rxq_info_reg(&rx_ring->xdp_rxq, adapter->netdev,
> + rx_ring->queue_index,
> + rx_ring->q_vector->napi.napi_id) < 0)
Unrelated, but I always wonder, if there shouldn?t be more logging for
the error cases.
> goto err;
>
> rx_ring->xdp_prog = adapter->xdp_prog;
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
Kind regards,
Paul
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-22 12:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-22 11:23 [PATCH net] ixgbe: add NULL pointer check before calling xdp_rxq_info_reg wangyunjian
2021-01-22 11:23 ` [Intel-wired-lan] " wangyunjian
2021-01-22 12:36 ` Paul Menzel
2021-01-22 12:36 ` Paul Menzel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.