From: Yunjian Wang <wangyunj...@huawei.com>

The skb header should be set to ethernet header before using
is_skb_forwardable(including dev->hard_header_len length).

Signed-off-by: Yunjian Wang <wangyunj...@huawei.com>
---
 net/bridge/br_forward.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index 5372e20..74b688b 100644
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -36,10 +36,10 @@ static inline int should_deliver(const struct 
net_bridge_port *p,
 
 int br_dev_queue_push_xmit(struct net *net, struct sock *sk, struct sk_buff 
*skb)
 {
+       skb_push(skb, ETH_HLEN);
        if (!is_skb_forwardable(skb->dev, skb))
                goto drop;
 
-       skb_push(skb, ETH_HLEN);
        br_drop_fake_rtable(skb);
 
        if (skb->ip_summed == CHECKSUM_PARTIAL &&
@@ -97,10 +97,10 @@ static void __br_forward(const struct net_bridge_port *to,
                net = dev_net(indev);
        } else {
                if (unlikely(netpoll_tx_running(to->br->dev))) {
+                       skb_push(skb, ETH_HLEN);
                        if (!is_skb_forwardable(skb->dev, skb)) {
                                kfree_skb(skb);
                        } else {
-                               skb_push(skb, ETH_HLEN);
                                br_netpoll_send_skb(to, skb);
                        }
                        return;
-- 
1.8.3.1


Reply via email to