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

!9127 hsr: Prevent use after free in prp_create_tagged_frame() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yue Haibing <yuehaibing@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/SP3MBTOON2IHMOYU2XTYDXRJMCCSPZID/ 
 
https://gitee.com/openeuler/kernel/issues/I9DFT4 
 
Link:https://gitee.com/openeuler/kernel/pulls/9127

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 4dafa181 361fc7ad

net/hsr/hsr_forward.c

+1 −3
Original line number Diff line number Diff line
@@ -294,9 +294,7 @@ struct sk_buff *prp_create_tagged_frame(struct hsr_frame_info *frame, 
	skb = skb_copy_expand(frame->skb_std, 0,

			      skb_tailroom(frame->skb_std) + HSR_HLEN,

			      GFP_ATOMIC);

	prp_fill_rct(skb, frame, port);



	return skb;

	return prp_fill_rct(skb, frame, port);

}



static void hsr_deliver_master(struct sk_buff *skb, struct net_device *dev,