* [2.6 patch] wan/hdlc_x25.c: fix a NULL dereference
@ 2008-08-27 22:05 Adrian Bunk
2008-08-29 7:08 ` Herbert Xu
2008-08-31 17:08 ` Krzysztof Halasa
0 siblings, 2 replies; 7+ messages in thread
From: Adrian Bunk @ 2008-08-27 22:05 UTC (permalink / raw)
To: Krzysztof Hałasa, Jeff Garzik; +Cc: netdev
I doubt stats matter much in this case, and this anyway was a
NULL dereference.
Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---
28711620a5326efc71d5228eeff5a28fed9355be
diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c
index 8b7e5d2..7599e37 100644
--- a/drivers/net/wan/hdlc_x25.c
+++ b/drivers/net/wan/hdlc_x25.c
@@ -163,10 +163,8 @@ static void x25_close(struct net_device *dev)
static int x25_rx(struct sk_buff *skb)
{
- if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
- skb->dev->stats.rx_dropped++;
+ if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
return NET_RX_DROP;
- }
if (lapb_data_received(skb->dev, skb) == LAPB_OK)
return NET_RX_SUCCESS;
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [2.6 patch] wan/hdlc_x25.c: fix a NULL dereference
2008-08-27 22:05 [2.6 patch] wan/hdlc_x25.c: fix a NULL dereference Adrian Bunk
@ 2008-08-29 7:08 ` Herbert Xu
2008-08-31 17:08 ` Krzysztof Halasa
1 sibling, 0 replies; 7+ messages in thread
From: Herbert Xu @ 2008-08-29 7:08 UTC (permalink / raw)
To: Adrian Bunk; +Cc: khc, jgarzik, netdev
Adrian Bunk <bunk@kernel.org> wrote:
>
> static int x25_rx(struct sk_buff *skb)
> {
> - if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
> - skb->dev->stats.rx_dropped++;
> + if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
> return NET_RX_DROP;
> - }
Why not keep the stat collection? It's not like saving skb->dev
on the stack is hard or anything...
Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [2.6 patch] wan/hdlc_x25.c: fix a NULL dereference
2008-08-27 22:05 [2.6 patch] wan/hdlc_x25.c: fix a NULL dereference Adrian Bunk
2008-08-29 7:08 ` Herbert Xu
@ 2008-08-31 17:08 ` Krzysztof Halasa
2008-09-03 14:12 ` Jeff Garzik
1 sibling, 1 reply; 7+ messages in thread
From: Krzysztof Halasa @ 2008-08-31 17:08 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Jeff Garzik, netdev
Adrian Bunk <bunk@kernel.org> writes:
> --- a/drivers/net/wan/hdlc_x25.c
> +++ b/drivers/net/wan/hdlc_x25.c
> @@ -163,10 +163,8 @@ static void x25_close(struct net_device *dev)
>
> static int x25_rx(struct sk_buff *skb)
> {
> - if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
> - skb->dev->stats.rx_dropped++;
> + if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
> return NET_RX_DROP;
> - }
>
Right, thanks... though I will update the stats anyway.
--
Krzysztof Halasa
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [2.6 patch] wan/hdlc_x25.c: fix a NULL dereference
2008-08-31 17:08 ` Krzysztof Halasa
@ 2008-09-03 14:12 ` Jeff Garzik
2008-09-03 16:14 ` Krzysztof Halasa
0 siblings, 1 reply; 7+ messages in thread
From: Jeff Garzik @ 2008-09-03 14:12 UTC (permalink / raw)
To: Krzysztof Halasa; +Cc: Adrian Bunk, Jeff Garzik, netdev
Krzysztof Halasa wrote:
> Adrian Bunk <bunk@kernel.org> writes:
>
>> --- a/drivers/net/wan/hdlc_x25.c
>> +++ b/drivers/net/wan/hdlc_x25.c
>> @@ -163,10 +163,8 @@ static void x25_close(struct net_device *dev)
>>
>> static int x25_rx(struct sk_buff *skb)
>> {
>> - if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
>> - skb->dev->stats.rx_dropped++;
>> + if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
>> return NET_RX_DROP;
>> - }
>>
>
> Right, thanks... though I will update the stats anyway.
In terms of patches... what does this mean? Does this mean you are
taking Adrian's patch, and updating it? Sending a follow-up patch?
Ack'ing Adrian's patch?
I don't want to hold this back due to lack of stat update...
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [2.6 patch] wan/hdlc_x25.c: fix a NULL dereference
2008-09-03 14:12 ` Jeff Garzik
@ 2008-09-03 16:14 ` Krzysztof Halasa
2008-09-03 16:21 ` Krzysztof Halasa
0 siblings, 1 reply; 7+ messages in thread
From: Krzysztof Halasa @ 2008-09-03 16:14 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Adrian Bunk, Jeff Garzik, netdev
Jeff Garzik <jeff@garzik.org> writes:
> In terms of patches... what does this mean? Does this mean you are
> taking Adrian's patch, and updating it? Sending a follow-up patch?
> Ack'ing Adrian's patch?
>
> I don't want to hold this back due to lack of stat update...
Right... The attached patch should do it. Sorry for the delay.
--
Krzysztof Halasa
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: wan/hdlc_x25.c: fix a NULL dereference
2008-09-03 16:14 ` Krzysztof Halasa
@ 2008-09-03 16:21 ` Krzysztof Halasa
2008-09-13 19:56 ` Jeff Garzik
0 siblings, 1 reply; 7+ messages in thread
From: Krzysztof Halasa @ 2008-09-03 16:21 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Adrian Bunk, netdev
WAN: fixes a NULL dereference in hdlc_x25.
Reported-by: Adrian Bunk <bunk@kernel.org>.
Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl>
diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c
index 8b7e5d2..cbcbf6f 100644
--- a/drivers/net/wan/hdlc_x25.c
+++ b/drivers/net/wan/hdlc_x25.c
@@ -163,15 +163,17 @@ static void x25_close(struct net_device *dev)
static int x25_rx(struct sk_buff *skb)
{
+ struct net_device *dev = skb->dev;
+
if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
- skb->dev->stats.rx_dropped++;
+ dev->stats.rx_dropped++;
return NET_RX_DROP;
}
- if (lapb_data_received(skb->dev, skb) == LAPB_OK)
+ if (lapb_data_received(dev, skb) == LAPB_OK)
return NET_RX_SUCCESS;
- skb->dev->stats.rx_errors++;
+ dev->stats.rx_errors++;
dev_kfree_skb_any(skb);
return NET_RX_DROP;
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: wan/hdlc_x25.c: fix a NULL dereference
2008-09-03 16:21 ` Krzysztof Halasa
@ 2008-09-13 19:56 ` Jeff Garzik
0 siblings, 0 replies; 7+ messages in thread
From: Jeff Garzik @ 2008-09-13 19:56 UTC (permalink / raw)
To: Krzysztof Halasa; +Cc: Adrian Bunk, netdev
Krzysztof Halasa wrote:
> WAN: fixes a NULL dereference in hdlc_x25.
>
> Reported-by: Adrian Bunk <bunk@kernel.org>.
> Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl>
>
> diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c
> index 8b7e5d2..cbcbf6f 100644
> --- a/drivers/net/wan/hdlc_x25.c
> +++ b/drivers/net/wan/hdlc_x25.c
> @@ -163,15 +163,17 @@ static void x25_close(struct net_device *dev)
>
> static int x25_rx(struct sk_buff *skb)
> {
> + struct net_device *dev = skb->dev;
> +
> if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
> - skb->dev->stats.rx_dropped++;
> + dev->stats.rx_dropped++;
> return NET_RX_DROP;
> }
>
> - if (lapb_data_received(skb->dev, skb) == LAPB_OK)
> + if (lapb_data_received(dev, skb) == LAPB_OK)
> return NET_RX_SUCCESS;
>
> - skb->dev->stats.rx_errors++;
> + dev->stats.rx_errors++;
> dev_kfree_skb_any(skb);
> return NET_RX_DROP;
applied
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2008-09-13 19:56 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-27 22:05 [2.6 patch] wan/hdlc_x25.c: fix a NULL dereference Adrian Bunk
2008-08-29 7:08 ` Herbert Xu
2008-08-31 17:08 ` Krzysztof Halasa
2008-09-03 14:12 ` Jeff Garzik
2008-09-03 16:14 ` Krzysztof Halasa
2008-09-03 16:21 ` Krzysztof Halasa
2008-09-13 19:56 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).