[PATCH net] Phonet: fix double free in GPRS outbound packet error path

[PATCH net] Phonet: fix double free in GPRS outbound packet error path

[Rémi Denis-Courmont]

From: "Remi Denis-Courmont" <remi.denis-courmont@nokia.com>

Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
---
 net/phonet/pep-gprs.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/net/phonet/pep-gprs.c b/net/phonet/pep-gprs.c
index 6a91a32..4aa8885 100644
--- a/net/phonet/pep-gprs.c
+++ b/net/phonet/pep-gprs.c
@@ -207,7 +207,6 @@ static int gprs_xmit(struct sk_buff *skb, struct net_device *dev)
 				dev->name, err);
 		dev->stats.tx_aborted_errors++;
 		dev->stats.tx_errors++;
-		dev_kfree_skb(skb);
 	} else {
 		dev->stats.tx_packets++;
 		dev->stats.tx_bytes += len;
-- 
1.5.6.5

[PATCH net] Phonet: do not compute unused value

[Rémi Denis-Courmont]

From: "Remi Denis-Courmont" <remi.denis-courmont@nokia.com>

Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
---
 net/phonet/pep.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/phonet/pep.c b/net/phonet/pep.c
index bb3e678..8ad2b53 100644
--- a/net/phonet/pep.c
+++ b/net/phonet/pep.c
@@ -553,7 +553,7 @@ static int pep_do_rcv(struct sock *sk, struct sk_buff *skb)
 {
 	struct pep_sock *pn = pep_sk(sk);
 	struct sock *sknode;
-	struct pnpipehdr *hdr = pnp_hdr(skb);
+	struct pnpipehdr *hdr;
 	struct sockaddr_pn dst;
 	int err = NET_RX_SUCCESS;
 	u8 pipe_handle;
-- 
1.5.6.5

Re: [PATCH net] Phonet: fix double free in GPRS outbound packet error path

[David Miller]

From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Date: Tue, 10 Feb 2009 16:23:54 +0200

> Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>

Applied.

Re: [PATCH net] Phonet: do not compute unused value

[David Miller]

From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Date: Tue, 10 Feb 2009 16:23:55 +0200

> Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>

Applied.