diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-09-19 13:45:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-09-20 15:14:16 -0400 |
| commit | 21d0c83302fb742b7ffb6089d40196166102f5ed (patch) | |
| tree | b11439340d1bb097867b57589fc4b6ce2f371a6a /drivers/net | |
| parent | 5588b40d7c2bff75ee573ed42d1738c73ce24492 (diff) | |
[PPP] pppoe: Fix double-free on skb after transmit failure
When I got rid of the second packet in __pppoe_xmit I created
a double-free on the skb because of the goto abort on failure.
This patch removes that.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/pppoe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index 0d7f570b9a54..9b30cd600a64 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c | |||
| @@ -879,8 +879,7 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb) | |||
| 879 | dev->hard_header(skb, dev, ETH_P_PPP_SES, | 879 | dev->hard_header(skb, dev, ETH_P_PPP_SES, |
| 880 | po->pppoe_pa.remote, NULL, data_len); | 880 | po->pppoe_pa.remote, NULL, data_len); |
| 881 | 881 | ||
| 882 | if (dev_queue_xmit(skb) < 0) | 882 | dev_queue_xmit(skb); |
| 883 | goto abort; | ||
| 884 | 883 | ||
| 885 | return 1; | 884 | return 1; |
| 886 | 885 | ||