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

!11045 bpf: Fix a segment issue when downgrading gso_size 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/54LP2W6ALVRA44BCUSKXQ2RXPHFSQDB5/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAKPRL 
 
Link:https://gitee.com/openeuler/kernel/pulls/11045

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 2a904839 ae1d8254

net/core/filter.c

+11 −4
Original line number Diff line number Diff line
@@ -3532,13 +3532,20 @@ static int bpf_skb_net_grow(struct sk_buff *skb, u32 off, u32 len_diff, 
	if (skb_is_gso(skb)) {

		struct skb_shared_info *shinfo = skb_shinfo(skb);



		/* Due to header grow, MSS needs to be downgraded. */

		if (!(flags & BPF_F_ADJ_ROOM_FIXED_GSO))

			skb_decrease_gso_size(shinfo, len_diff);



		/* Header must be checked, and gso_segs recomputed. */

		shinfo->gso_type |= gso_type;

		shinfo->gso_segs = 0;



		/* Due to header growth, MSS needs to be downgraded.

		 * There is a BUG_ON() when segmenting the frag_list with

		 * head_frag true, so linearize the skb after downgrading

		 * the MSS.

		 */

		if (!(flags & BPF_F_ADJ_ROOM_FIXED_GSO)) {

			skb_decrease_gso_size(shinfo, len_diff);

			if (shinfo->frag_list)

				return skb_linearize(skb);

		}

	}



	return 0;