From patchwork Fri Apr 17 01:02:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 461898 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0C0EB140293 for ; Fri, 17 Apr 2015 11:02:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752794AbbDQBCX (ORCPT ); Thu, 16 Apr 2015 21:02:23 -0400 Received: from helcar.hengli.com.au ([209.40.204.226]:36391 "EHLO helcar.hengli.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751486AbbDQBCV (ORCPT ); Thu, 16 Apr 2015 21:02:21 -0400 Received: from gondolin.me.apana.org.au ([192.168.0.6]) by norbury.hengli.com.au with esmtp (Exim 4.80 #3 (Debian)) id 1Yiufj-0002XC-A1; Fri, 17 Apr 2015 11:02:19 +1000 Received: from herbert by gondolin.me.apana.org.au with local (Exim 4.80) (envelope-from ) id 1Yiufh-0005qa-08; Fri, 17 Apr 2015 09:02:17 +0800 Date: Fri, 17 Apr 2015 09:02:16 +0800 From: Herbert Xu To: netdev@vger.kernel.org, jamal Subject: act_mirred: Fix bogus header when redirecting from VLAN Message-ID: <20150417010216.GA22415@gondor.apana.org.au> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When you redirect a VLAN device to an ifb device, you end up with crap within the ifb device because they have unequal hard header lengths and the redirected packet contains four extra bytes at the start which then gets interpreted as part of the MAC address. This patch fixes this by only pushing on the hard header length of ifb. This assumes that the original packet actually has enough header for that so checks have been added to that effect. Signed-off-by: Herbert Xu diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c index 34f846b..1256d26 100644 --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c @@ -105,7 +105,7 @@ static void ri_tasklet(unsigned long dev) if (from & AT_EGRESS) { dev_queue_xmit(skb); } else if (from & AT_INGRESS) { - skb_pull(skb, skb->dev->hard_header_len); + skb_pull(skb, _dev->hard_header_len); netif_receive_skb(skb); } else BUG(); diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index 5953517..44e4d50 100644 --- a/net/sched/act_mirred.c +++ b/net/sched/act_mirred.c @@ -151,13 +151,25 @@ static int tcf_mirred(struct sk_buff *skb, const struct tc_action *a, } at = G_TC_AT(skb->tc_verd); + + if (!(at & AT_EGRESS) && m->tcfm_ok_push && + (skb_headroom(skb) < dev->hard_header_len || + skb->dev->hard_header_len < dev->hard_header_len)) { + net_notice_ratelimited( + "tc mirred: Insufficient headroom from %s to %s: " + "%d %d\n", + skb->dev->name, dev->name, + skb_headroom(skb), skb->dev->hard_header_len); + goto out; + } + skb2 = skb_act_clone(skb, GFP_ATOMIC, m->tcf_action); if (skb2 == NULL) goto out; if (!(at & AT_EGRESS)) { if (m->tcfm_ok_push) - skb_push(skb2, skb2->dev->hard_header_len); + skb_push(skb2, dev->hard_header_len); } /* mirror is always swallowed */