Commit:     21d0c83302fb742b7ffb6089d40196166102f5ed
Parent:     5588b40d7c2bff75ee573ed42d1738c73ce24492
Author:     Herbert Xu <[EMAIL PROTECTED]>
AuthorDate: Wed Sep 19 10:45:02 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Thu Sep 20 12:14:16 2007 -0700

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 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 0d7f570..9b30cd6 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 
        dev->hard_header(skb, dev, ETH_P_PPP_SES,
                         po->pppoe_pa.remote, NULL, data_len);
-       if (dev_queue_xmit(skb) < 0)
-               goto abort;
+       dev_queue_xmit(skb);
        return 1;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to