Unverified Commit 5660a280 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10026 liquidio: Adjust a NULL pointer handling path in lio_vf_rep_copy_packet 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/QFSKZGSASE5RFMHIC5P74UEGV3SIDHRE/ 
 
https://gitee.com/src-openeuler/kernel/issues/IACZW2 
 
Link:https://gitee.com/openeuler/kernel/pulls/10026

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents c817aea4 6615a9b3

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

+5 −6
Original line number Original line Diff line number Diff line
@@ -289,13 +289,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));