From patchwork Wed Jul 27 13:10:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 107059 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 439C9B6F68 for ; Wed, 27 Jul 2011 23:10:18 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754031Ab1G0NKN (ORCPT ); Wed, 27 Jul 2011 09:10:13 -0400 Received: from helcar.apana.org.au ([209.40.204.226]:49550 "EHLO fornost.hengli.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752627Ab1G0NKL (ORCPT ); Wed, 27 Jul 2011 09:10:11 -0400 Received: from gondolin.me.apana.org.au ([192.168.0.6]) by fornost.hengli.com.au with esmtp (Exim 4.69 #1 (Debian)) id 1Qm3sI-0002Vk-2B; Wed, 27 Jul 2011 23:10:10 +1000 Received: from herbert by gondolin.me.apana.org.au with local (Exim 4.69) (envelope-from ) id 1Qm3sG-0007VU-MK; Wed, 27 Jul 2011 21:10:08 +0800 Date: Wed, 27 Jul 2011 21:10:08 +0800 From: Herbert Xu To: "David S. Miller" , netdev@vger.kernel.org Subject: gro: Only reset frag0 when skb can be pulled Message-ID: <20110727131008.GA28825@gondor.apana.org.au> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi: gro: Only reset frag0 when skb can be pulled Currently skb_gro_header_slow unconditionally resets frag0 and frag0_len. However, when we can't pull on the skb this leaves the GRO fields in an inconsistent state. This patch fixes this by only resetting those fields after the pskb_may_pull test. Signed-off-by: Herbert Xu Cheers, diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index ea6f4aa..a692a7c 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1679,9 +1679,12 @@ static inline int skb_gro_header_hard(struct sk_buff *skb, unsigned int hlen) static inline void *skb_gro_header_slow(struct sk_buff *skb, unsigned int hlen, unsigned int offset) { + if (!pskb_may_pull(skb, hlen)) + return NULL; + NAPI_GRO_CB(skb)->frag0 = NULL; NAPI_GRO_CB(skb)->frag0_len = 0; - return pskb_may_pull(skb, hlen) ? skb->data + offset : NULL; + return skb->data + offset; } static inline void *skb_gro_mac_header(struct sk_buff *skb)