Unverified Commit 442847ce authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12932 gso: fix udp gso fraglist segmentation after pull from frag_list 

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

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents ff5f723b 9d4f8f2e

net/ipv4/udp_offload.c

+20 −2
Original line number Diff line number Diff line
@@ -290,9 +290,27 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb, 
		return NULL;

	}



	if (skb_shinfo(gso_skb)->gso_type & SKB_GSO_FRAGLIST)

	if (skb_shinfo(gso_skb)->gso_type & SKB_GSO_FRAGLIST) {

		 /* Detect modified geometry and pass those to skb_segment. */

		if (skb_pagelen(gso_skb) - sizeof(*uh) == skb_shinfo(gso_skb)->gso_size)

			return __udp_gso_segment_list(gso_skb, features, is_ipv6);



		 /* Setup csum, as fraglist skips this in udp4_gro_receive. */

		gso_skb->csum_start = skb_transport_header(gso_skb) - gso_skb->head;

		gso_skb->csum_offset = offsetof(struct udphdr, check);

		gso_skb->ip_summed = CHECKSUM_PARTIAL;



		uh = udp_hdr(gso_skb);

		if (is_ipv6)

			uh->check = ~udp_v6_check(gso_skb->len,

						  &ipv6_hdr(gso_skb)->saddr,

						  &ipv6_hdr(gso_skb)->daddr, 0);

		else

			uh->check = ~udp_v4_check(gso_skb->len,

						  ip_hdr(gso_skb)->saddr,

						  ip_hdr(gso_skb)->daddr, 0);

	}



	skb_pull(gso_skb, sizeof(*uh));



	/* clear destructor to avoid skb_segment assigning it to tail */