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

!14803 net: hsr: avoid potential out-of-bound access in fill_frame_info() 

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

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents ef9b72ca d688f188

net/hsr/hsr_forward.c

+2 −0
Original line number Diff line number Diff line
@@ -525,6 +525,8 @@ static int fill_frame_info(struct hsr_frame_info *frame, 
		frame->is_vlan = true;



	if (frame->is_vlan) {

		if (skb->mac_len < offsetofend(struct hsr_vlan_ethhdr, vlanhdr))

			return -EINVAL;

		vlan_hdr = (struct hsr_vlan_ethhdr *)ethhdr;

		proto = vlan_hdr->vlanhdr.h_vlan_encapsulated_proto;

		/* FIXME: */