From patchwork Tue Dec 7 15:05:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 74556 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 359A2B70A9 for ; Wed, 8 Dec 2010 02:12:27 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754577Ab0LGPLw (ORCPT ); Tue, 7 Dec 2010 10:11:52 -0500 Received: from mail-yx0-f174.google.com ([209.85.213.174]:59429 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754213Ab0LGPLv (ORCPT ); Tue, 7 Dec 2010 10:11:51 -0500 Received: by yxt3 with SMTP id 3so2512yxt.19 for ; Tue, 07 Dec 2010 07:11:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=aeSg5jqzFO0WPFHYede0O1XIZxwD6e6YVGrwRlrZexw=; b=LkSztFegTDvThXtos38hEfSJWabuF3JNefz4/Gh35hmsgEBB3fQN+UYU0B/2LOJ5mU ATbLYZ3Mf7VLp4yO3FIyh8CRdvjN3xmPeQIbJkD3/z/FFsWwB7d9D+f8c8Jn2lqBH3aP VAdP8Qc5Y213+WgfKZ6yuq/g1PHzJeWLdI7Io= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=pnhehW6ptuBqt4QvN7wN+o6H5JeefypiE0IhJlxycbGD0K5/9X/uQHBS4Yw9FD6Z4w mauQ8WQKqNMrf08fOjwBhi0VZZu/iW+8xBQeaTXMdUImmMfZLkqN9QymqTsp6h+0NYqo NObjgNjZjlFiWxfEuTYuOYPNyUsbb6VIqw7GM= Received: by 10.151.49.18 with SMTP id b18mr1975756ybk.299.1291734337465; Tue, 07 Dec 2010 07:05:37 -0800 (PST) Received: from localhost.localdomain ([221.239.34.230]) by mx.google.com with ESMTPS id u3sm214473yba.16.2010.12.07.07.05.30 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 07 Dec 2010 07:05:36 -0800 (PST) From: Changli Gao To: "David S. Miller" Cc: Eric Dumazet , Jiri Pirko , Neil Horman , netdev@vger.kernel.org, Changli Gao Subject: [PATCH] af_packet: fix freeing pg_vec twice on error path Date: Tue, 7 Dec 2010 23:05:18 +0800 Message-Id: <1291734318-17989-1-git-send-email-xiaosuo@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It is introduced in: commit 0e3125c755445664f00ad036e4fc2cd32fd52877 Author: Neil Horman Date: Tue Nov 16 10:26:47 2010 -0800 packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4) Signed-off-by: Changli Gao --- net/packet/af_packet.c | 1 - 1 file changed, 1 deletion(-) -- 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/packet/af_packet.c b/net/packet/af_packet.c index 0e152b1..d163f78 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -2408,7 +2408,6 @@ out: out_free_pgvec: free_pg_vec(pg_vec, order, block_nr); - kfree(pg_vec); pg_vec = NULL; goto out; }