From patchwork Fri Dec 13 15:00:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Hambleton X-Patchwork-Id: 301057 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 282492C00A2 for ; Sat, 14 Dec 2013 02:00:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752943Ab3LMPAl (ORCPT ); Fri, 13 Dec 2013 10:00:41 -0500 Received: from mail-gw1-out.broadcom.com ([216.31.210.62]:37322 "EHLO mail-gw1-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752759Ab3LMPAj (ORCPT ); Fri, 13 Dec 2013 10:00:39 -0500 X-IronPort-AV: E=Sophos;i="4.95,479,1384329600"; d="scan'208";a="2435408" Received: from irvexchcas07.broadcom.com (HELO IRVEXCHCAS07.corp.ad.broadcom.com) ([10.9.208.55]) by mail-gw1-out.broadcom.com with ESMTP; 13 Dec 2013 07:05:40 -0800 Received: from IRVEXCHMB14.corp.ad.broadcom.com ([fe80::6184:5cb6:5350:4823]) by IRVEXCHCAS07.corp.ad.broadcom.com ([::1]) with mapi id 14.01.0438.000; Fri, 13 Dec 2013 07:00:38 -0800 From: Mark Hambleton To: Hannes Frederic Sowa , Mark Brown CC: 'Pravin B Shelar' , 'Saran Neti' , "'David S. Miller'" , 'Greg Kroah-Hartman' , "'netdev@vger.kernel.org'" , "'stable@vger.kernel.org'" Subject: RE: ipv6: fix headroom calculation in udp6_ufo_fragment Thread-Topic: ipv6: fix headroom calculation in udp6_ufo_fragment Thread-Index: Ac74A4BbcyJXDnLYQ2OnLUnbNHwUlgAR6hiAAABAX4AAAQ+AgAAPGTaw Date: Fri, 13 Dec 2013 15:00:37 +0000 Message-ID: References: <20131213133453.GB7332@order.stressinduktion.org> <20131213134205.GB11044@sirena.org.uk> <20131213141227.GC7332@order.stressinduktion.org> In-Reply-To: <20131213141227.GC7332@order.stressinduktion.org> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.9.208.64] MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Thanks! That fixes the warning and looks like it will work. Mark -----Original Message----- From: Hannes Frederic Sowa [mailto:hannes@stressinduktion.org] Sent: 13 December 2013 14:12 To: Mark Brown Cc: Mark Hambleton; 'Pravin B Shelar'; 'Saran Neti'; 'David S. Miller'; 'Greg Kroah-Hartman'; 'netdev@vger.kernel.org'; 'stable@vger.kernel.org' Subject: Re: ipv6: fix headroom calculation in udp6_ufo_fragment On Fri, Dec 13, 2013 at 01:42:05PM +0000, Mark Brown wrote: > On Fri, Dec 13, 2013 at 02:34:53PM +0100, Hannes Frederic Sowa wrote: > > > Sorry, I don't know which version the LTS kernel is. Upstream does not use > > sk_buff_data_t for mac_header any more. > > This is with v3.10. The change happend in 3.11. So I guess it was an oversight while backporting. Following patch should help and should get backported to all stable kernels <= 3.10. [PATCH stable] ipv6: fix illegal mac_header comparison on 32bit Signed-off-by: Hannes Frederic Sowa --- Patch intended for stable kernel <= 3.10. net/ipv6/udp_offload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.8.3.1 diff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c index e7359f9..e15a357 100644 --- a/net/ipv6/udp_offload.c +++ b/net/ipv6/udp_offload.c @@ -90,7 +90,7 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb, /* Check if there is enough headroom to insert fragment header. */ tnl_hlen = skb_tnl_header_len(skb); - if (skb->mac_header < (tnl_hlen + frag_hdr_sz)) { + if (skb_mac_header(skb) < skb->head + tnl_hlen + frag_hdr_sz) { if (gso_pskb_expand_head(skb, tnl_hlen + frag_hdr_sz)) goto out; }