From patchwork Wed Jul 20 07:23:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 105589 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 5A643B6F77 for ; Wed, 20 Jul 2011 17:25:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751100Ab1GTHZj (ORCPT ); Wed, 20 Jul 2011 03:25:39 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:39743 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750981Ab1GTHZi (ORCPT ); Wed, 20 Jul 2011 03:25:38 -0400 Received: by wwe5 with SMTP id 5so4916268wwe.1 for ; Wed, 20 Jul 2011 00:25:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=k/R5Lq9qIbYspKH5qfmoHPupi7QihiFOE5rU/Kh3vzE=; b=FdFFKaSiuIBP/f+9k9hRXm8Do30w3FnsDnFyDMuCZQAvCa2bXuTTAyOLD4gh+SRHAM KOi6tBT0/zheU07O5ikHMZR5RvtT1LsP48K5zz0lkA+e1cvLHs0iUE8q/G4pYmMiy1po 8/RplWwc44x5y0TT7vWQvZs5YnVMqpNtqJpDQ= Received: by 10.216.78.198 with SMTP id g48mr7902519wee.45.1311146737113; Wed, 20 Jul 2011 00:25:37 -0700 (PDT) Received: from shale.localdomain ([41.202.225.152]) by mx.google.com with ESMTPS id k84sm3504855weq.46.2011.07.20.00.25.32 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Jul 2011 00:25:35 -0700 (PDT) Date: Wed, 20 Jul 2011 10:23:43 +0300 From: Dan Carpenter To: Shirley Ma Cc: "David S. Miller" , Eric Dumazet , =?utf-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= , "open list:NETWORKING [GENERAL]" , kernel-janitors@vger.kernel.org Subject: [patch] skbuff: use kfree_skb() instead of kfree() Message-ID: <20110720072343.GF6445@shale.localdomain> 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 "n" was allocated with alloc_skb() so we should free it with kfree_skb() instead of regular kfree(). Signed-off-by: Dan Carpenter --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/core/skbuff.c b/net/core/skbuff.c index d220119..cc0c6f0 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -799,7 +799,7 @@ struct sk_buff *pskb_copy(struct sk_buff *skb, gfp_t gfp_mask) if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) { if (skb_copy_ubufs(skb, gfp_mask)) { - kfree(n); + kfree_skb(n); goto out; } skb_shinfo(skb)->tx_flags &= ~SKBTX_DEV_ZEROCOPY;