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

!9346 net: bridge: xmit: make sure we have at least eth header len bytes 

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

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents dc011b0f 2c0529f0

net/bridge/br_device.c

+6 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ EXPORT_SYMBOL_GPL(nf_br_ops); 
/* net device transmit always called with BH disabled */

netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)

{

	enum skb_drop_reason reason = pskb_may_pull_reason(skb, ETH_HLEN);

	struct net_bridge_mcast_port *pmctx_null = NULL;

	struct net_bridge *br = netdev_priv(dev);

	struct net_bridge_mcast *brmctx = &br->multicast_ctx;
@@ -38,6 +39,11 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) 
	const unsigned char *dest;

	u16 vid = 0;



	if (unlikely(reason != SKB_NOT_DROPPED_YET)) {

		kfree_skb_reason(skb, reason);

		return NETDEV_TX_OK;

	}



	memset(skb->cb, 0, sizeof(struct br_input_skb_cb));

	br_tc_skb_miss_set(skb, false);