From: James Chapman <jchapman@katalix.com>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>,
"Michal Ostrowski" <mostrows@speakeasy.net>,
"Paul Mackerras" <paulus@samba.org>,
"Toralf Förster" <toralf.foerster@gmx.de>,
netdev@vger.kernel.org
Subject: Re: [PATCH 3/3] [PPP] L2TP: Fix skb handling in pppol2tp_xmit
Date: Wed, 19 Sep 2007 09:43:49 +0100 [thread overview]
Message-ID: <46F0E145.4020501@katalix.com> (raw)
In-Reply-To: <20070919012529.GA15046@gondor.apana.org.au>
Herbert Xu wrote:
> On Tue, Sep 18, 2007 at 09:19:33PM +0100, James Chapman wrote:
>> This one causes my test system to lock up. I'll investigate. Please
>> don't apply this patch for now.
>
> Sorry, I added a double-free on the skb after ip_queue_xmit.
> Please try this one instead.
>
> - /* Free the original skb */
> - kfree_skb(skb);
> -
> return 1;
>
> -discard:
> - /* Free the new skb. Caller will free original skb. */
> - if (skb2 != skb)
> - kfree_skb(skb2);
> abort:
> - return 0;
> + /* Free the original skb */
> + kfree_skb(skb);
> + return 1;
> }
Shouldn't this return 0 in the error case and without the kfree_skb()?
This lets ppp requeue the skb.
--
James Chapman
Katalix Systems Ltd
http://www.katalix.com
Catalysts for your Embedded Linux software development
next prev parent reply other threads:[~2007-09-19 8:44 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200708281811.34074.toralf.foerster@gmx.de>
2007-08-29 7:35 ` malformed captured packets James Chapman
2007-08-29 16:22 ` Toralf Förster
2007-08-30 9:51 ` James Chapman
2007-08-31 7:36 ` Toralf Förster
2007-08-31 9:06 ` [0/7] [PPP]: Fix shared/cloned/non-linear skb bugs (was: malformed captured packets) Herbert Xu
2007-08-31 9:11 ` [PATCH 1/7] [PPP] pppoe: Fix skb_unshare_check call position Herbert Xu
2007-08-31 9:11 ` [PATCH 2/7] [PPP] pppoe: Fix data clobbering in __pppoe_xmit and return value Herbert Xu
2007-08-31 9:11 ` [PATCH 3/7] [PPP] pppoe: Fill in header directly in __pppoe_xmit Herbert Xu
2007-08-31 9:11 ` [PATCH 4/7] [BRIDGE]: Kill clone argument to br_flood_* Herbert Xu
2007-08-31 9:11 ` [PATCH 5/7] [NET] skbuff: Add skb_cow_head Herbert Xu
2007-08-31 9:11 ` [PATCH 6/7] [PPP] generic: Call skb_cow_head before scribbling over skb Herbert Xu
2007-08-31 9:11 ` [PATCH 7/7] [PPP] generic: Fix receive path data clobbering & non-linear handling Herbert Xu
2007-08-31 14:02 ` [0/7] [PPP]: Fix shared/cloned/non-linear skb bugs (was: malformed captured packets) Toralf Förster
2007-09-03 9:32 ` Toralf Förster
2007-09-11 18:12 ` Toralf Förster
2007-09-19 11:51 ` Herbert Xu
[not found] ` <E1IR2Uj-0007MU-00@gondolin.me.apana.org.au>
2007-09-16 23:19 ` [PATCH 1/7] [PPP] pppoe: Fix skb_unshare_check call position David Miller
[not found] ` <E1IR2Uy-0007Ms-00@gondolin.me.apana.org.au>
2007-09-16 23:20 ` [PATCH 2/7] [PPP] pppoe: Fix data clobbering in __pppoe_xmit and return value David Miller
[not found] ` <E1IR2V6-0007N6-00@gondolin.me.apana.org.au>
2007-09-16 23:20 ` [PATCH 3/7] [PPP] pppoe: Fill in header directly in __pppoe_xmit David Miller
[not found] ` <E1IR2V8-0007NE-00@gondolin.me.apana.org.au>
2007-09-16 23:21 ` [PATCH 4/7] [BRIDGE]: Kill clone argument to br_flood_* David Miller
[not found] ` <E1IR2V9-0007NM-00@gondolin.me.apana.org.au>
2007-09-16 23:21 ` [PATCH 5/7] [NET] skbuff: Add skb_cow_head David Miller
[not found] ` <E1IR2VA-0007NU-00@gondolin.me.apana.org.au>
2007-09-16 23:21 ` [PATCH 6/7] [PPP] generic: Call skb_cow_head before scribbling over skb David Miller
[not found] ` <E1IR2VB-0007Nc-00@gondolin.me.apana.org.au>
2007-09-16 23:22 ` [PATCH 7/7] [PPP] generic: Fix receive path data clobbering & non-linear handling David Miller
2007-09-18 12:04 ` [0/3] [PPP]: Fix pppol2tp skb bugs Herbert Xu
2007-09-18 12:08 ` [PATCH 1/3] [PPP] L2TP: Disallow non-UDP datagram sockets Herbert Xu
2007-09-18 12:08 ` [PATCH 2/3] [PPP] L2TP: Fix skb handling in pppol2tp_recv_core Herbert Xu
2007-09-18 12:08 ` [PATCH 3/3] [PPP] L2TP: Fix skb handling in pppol2tp_xmit Herbert Xu
[not found] ` <E1IXbqW-0002OB-00@gondolin.me.apana.org.au>
2007-09-18 20:16 ` [PATCH 1/3] [PPP] L2TP: Disallow non-UDP datagram sockets James Chapman
[not found] ` <E1IXbqo-0002OW-00@gondolin.me.apana.org.au>
2007-09-18 20:17 ` [PATCH 2/3] [PPP] L2TP: Fix skb handling in pppol2tp_recv_core James Chapman
2007-09-18 20:17 ` [0/3] [PPP]: Fix pppol2tp skb bugs David Miller
[not found] ` <E1IXbqs-0002Od-00@gondolin.me.apana.org.au>
2007-09-18 20:19 ` [PATCH 3/3] [PPP] L2TP: Fix skb handling in pppol2tp_xmit James Chapman
2007-09-18 20:32 ` David Miller
2007-09-19 1:30 ` Herbert Xu
2007-09-19 17:45 ` David Miller
2007-09-19 23:11 ` Adrian Bunk
2007-09-19 23:12 ` David Miller
2007-09-19 1:25 ` Herbert Xu
2007-09-19 8:43 ` James Chapman [this message]
2007-09-19 8:51 ` Herbert Xu
2007-09-19 17:47 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46F0E145.4020501@katalix.com \
--to=jchapman@katalix.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=mostrows@speakeasy.net \
--cc=netdev@vger.kernel.org \
--cc=paulus@samba.org \
--cc=toralf.foerster@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.