Commit c44711b7 authored by Aleksandr Mishin's avatar Aleksandr Mishin Committed by David S. Miller

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: 1f233f32 ("liquidio: switchdev support for LiquidIO NIC")
Signed-off-by: default avatarAleksandr Mishin <amishin@t-argos.ru>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dbfb8864
...@@ -272,13 +272,12 @@ lio_vf_rep_copy_packet(struct octeon_device *oct, ...@@ -272,13 +272,12 @@ lio_vf_rep_copy_packet(struct octeon_device *oct,
pg_info->page_offset; pg_info->page_offset;
memcpy(skb->data, va, MIN_SKB_SIZE); memcpy(skb->data, va, MIN_SKB_SIZE);
skb_put(skb, MIN_SKB_SIZE); skb_put(skb, MIN_SKB_SIZE);
}
skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
pg_info->page, pg_info->page,
pg_info->page_offset + MIN_SKB_SIZE, pg_info->page_offset + MIN_SKB_SIZE,
len - MIN_SKB_SIZE, len - MIN_SKB_SIZE,
LIO_RXBUFFER_SZ); LIO_RXBUFFER_SZ);
}
} else { } else {
struct octeon_skb_page_info *pg_info = struct octeon_skb_page_info *pg_info =
((struct octeon_skb_page_info *)(skb->cb)); ((struct octeon_skb_page_info *)(skb->cb));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment