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

!13060 net: add more sanity checks to qdisc_pkt_len_init() 

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

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents c6911909 668d838e

net/core/dev.c

+7 −3
Original line number Diff line number Diff line
@@ -3754,10 +3754,14 @@ static void qdisc_pkt_len_init(struct sk_buff *skb) 
				hdr_len += sizeof(struct udphdr);

		}



		if (shinfo->gso_type & SKB_GSO_DODGY)

			gso_segs = DIV_ROUND_UP(skb->len - hdr_len,

						shinfo->gso_size);

		if (unlikely(shinfo->gso_type & SKB_GSO_DODGY)) {

			int payload = skb->len - hdr_len;



			/* Malicious packet. */

			if (payload <= 0)

				return;

			gso_segs = DIV_ROUND_UP(payload, shinfo->gso_size);

		}

		qdisc_skb_cb(skb)->pkt_len += (gso_segs - 1) * hdr_len;

	}

}