From patchwork Wed May 26 01:48:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abraham Arce X-Patchwork-Id: 102318 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4Q1mceA027533 for ; Wed, 26 May 2010 01:48:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933881Ab0EZBsI (ORCPT ); Tue, 25 May 2010 21:48:08 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:51858 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933412Ab0EZBsG convert rfc822-to-8bit (ORCPT ); Tue, 25 May 2010 21:48:06 -0400 Received: from dlep35.itg.ti.com ([157.170.170.118]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o4Q1m4Rb016258 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 25 May 2010 20:48:04 -0500 Received: from dlep26.itg.ti.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o4Q1m3qV011545; Tue, 25 May 2010 20:48:03 -0500 (CDT) Received: from dlee75.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id o4Q1m30b006558; Tue, 25 May 2010 20:48:03 -0500 (CDT) Received: from dlee03.ent.ti.com ([157.170.170.18]) by dlee75.ent.ti.com ([157.170.170.72]) with mapi; Tue, 25 May 2010 20:48:03 -0500 From: "Arce, Abraham" To: "netdev@vger.kernel.org" , David Miller CC: "linux-kernel@vger.kernel.org" , "linux-nfs@vger.kernel.org" , "linux-omap@vger.kernel.org" , Tony Lindgren , "Shilimkar, Santosh" Date: Tue, 25 May 2010 20:48:02 -0500 Subject: RE: NULL Pointer Deference: NFS & Telnet Thread-Topic: NULL Pointer Deference: NFS & Telnet Thread-Index: Acr7sMEhWAICO9I8TUCo7EaT0RzjBwAwoBPg Message-ID: <27F9C60D11D683428E133F85D2BB4A53043E3EDFE6@dlee03.ent.ti.com> References: <27F9C60D11D683428E133F85D2BB4A53043E33A997@dlee03.ent.ti.com> In-Reply-To: <27F9C60D11D683428E133F85D2BB4A53043E33A997@dlee03.ent.ti.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 26 May 2010 01:48:38 +0000 (UTC) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index f8abf68..eb81f76 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -334,7 +334,7 @@ static void skb_release_data(struct sk_buff *skb) if (!skb->cloned || !atomic_sub_return(skb->nohdr ? (1 << SKB_DATAREF_SHIFT) + 1 : 1, &skb_shinfo(skb)->dataref)) { - if (skb_shinfo(skb)->nr_frags) { + if (skb_shinfo(skb)->nr_frags && skb_has_frags(skb)) { int i; for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) put_page(skb_shinfo(skb)->frags[i].page);