Skip to content

Commit c44711b

Browse files
Aleksandr Mishindavem330
authored andcommitted
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: 1f233f3 ("liquidio: switchdev support for LiquidIO NIC") Signed-off-by: Aleksandr Mishin <[email protected]> Reviewed-by: Simon Horman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent dbfb886 commit c44711b

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -272,13 +272,12 @@ lio_vf_rep_copy_packet(struct octeon_device *oct,
272272
pg_info->page_offset;
273273
memcpy(skb->data, va, MIN_SKB_SIZE);
274274
skb_put(skb, MIN_SKB_SIZE);
275+
skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
276+
pg_info->page,
277+
pg_info->page_offset + MIN_SKB_SIZE,
278+
len - MIN_SKB_SIZE,
279+
LIO_RXBUFFER_SZ);
275280
}
276-
277-
skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
278-
pg_info->page,
279-
pg_info->page_offset + MIN_SKB_SIZE,
280-
len - MIN_SKB_SIZE,
281-
LIO_RXBUFFER_SZ);
282281
} else {
283282
struct octeon_skb_page_info *pg_info =
284283
((struct octeon_skb_page_info *)(skb->cb));

0 commit comments

Comments
 (0)