]> www.infradead.org Git - users/dwmw2/linux.git/commit
liquidio: Adjust a NULL pointer handling path in lio_vf_rep_copy_packet
authorAleksandr Mishin <amishin@t-argos.ru>
Wed, 5 Jun 2024 10:11:35 +0000 (13:11 +0300)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Jun 2024 13:22:19 +0000 (14:22 +0100)
commitc44711b78608c98a3e6b49ce91678cd0917d5349
tree94d4dbfccfb3f1ccbe1f488672b97071ceef0230
parentdbfb8864650ec0b69e0a1b9b667bf79c25ca33ca
liquidio: Adjust a NULL pointer handling path in lio_vf_rep_copy_packet

In lio_vf_rep_copy_packet() pg_info->page is compared to a NULL value,
but then it is unconditionally passed to skb_add_rx_frag() which looks
strange and could lead to null pointer dereference.

lio_vf_rep_copy_packet() call trace looks like:
octeon_droq_process_packets
 octeon_droq_fast_process_packets
  octeon_droq_dispatch_pkt
   octeon_create_recv_info
    ...search in the dispatch_list...
     ->disp_fn(rdisp->rinfo, ...)
      lio_vf_rep_pkt_recv(struct octeon_recv_info *recv_info, ...)
In this path there is no code which sets pg_info->page to NULL.
So this check looks unneeded and doesn't solve potential problem.
But I guess the author had reason to add a check and I have no such card
and can't do real test.
In addition, the code in the function liquidio_push_packet() in
liquidio/lio_core.c does exactly the same.

Based on this, I consider the most acceptable compromise solution to
adjust this issue by moving skb_add_rx_frag() into conditional scope.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 1f233f327913 ("liquidio: switchdev support for LiquidIO NIC")
Signed-off-by: Aleksandr Mishin <amishin@t-argos.ru>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c