Patchwork af_packet: fix freeing pg_vec twice on error path

login
register
mail settings
Submitter Changli Gao
Date Dec. 7, 2010, 3:05 p.m.
Message ID <1291734318-17989-1-git-send-email-xiaosuo@gmail.com>
Download mbox | patch
Permalink /patch/74556/
State Accepted
Delegated to: David Miller
Headers show

Comments

Changli Gao - Dec. 7, 2010, 3:05 p.m.
It is introduced in:
        commit 0e3125c755445664f00ad036e4fc2cd32fd52877
        Author: Neil Horman <nhorman@tuxdriver.com>
        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 <xiaosuo@gmail.com>
---
 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
David Miller - Dec. 8, 2010, 6:44 p.m.
From: Changli Gao <xiaosuo@gmail.com>
Date: Tue,  7 Dec 2010 23:05:18 +0800

> It is introduced in:
>         commit 0e3125c755445664f00ad036e4fc2cd32fd52877
>         Author: Neil Horman <nhorman@tuxdriver.com>
>         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 <xiaosuo@gmail.com>

Applied.
--
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

Patch

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;
 }