* [PATCH] netfilter: bridge: refcount fix
@ 2009-08-24 17:18 Eric Dumazet
2009-08-24 17:22 ` Patrick McHardy
0 siblings, 1 reply; 4+ messages in thread
From: Eric Dumazet @ 2009-08-24 17:18 UTC (permalink / raw)
To: David S. Miller; +Cc: Linux Netdev List, Patrick McHardy, Bart De Schuymer
Hi David
I found following by code review only, I am not sure it is critical enough for net-2.6
This is a stable candidate, bug is more than 2 years old.
Thanks
commit f216f082b2b37c4943f1e7c393e2786648d48f6f
([NETFILTER]: bridge netfilter: deal with martians correctly)
added a refcount leak on in_dev.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
---
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 4fde742..c62eca3 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -386,6 +386,7 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
dst_release((struct dst_entry *)rt);
}
free_skb:
+ in_dev_put(in_dev);
kfree_skb(skb);
return 0;
} else {
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] netfilter: bridge: refcount fix
2009-08-24 17:18 [PATCH] netfilter: bridge: refcount fix Eric Dumazet
@ 2009-08-24 17:22 ` Patrick McHardy
2009-08-24 17:32 ` Eric Dumazet
0 siblings, 1 reply; 4+ messages in thread
From: Patrick McHardy @ 2009-08-24 17:22 UTC (permalink / raw)
To: Eric Dumazet; +Cc: David S. Miller, Linux Netdev List, Bart De Schuymer
Eric Dumazet wrote:
> Hi David
>
> I found following by code review only, I am not sure it is critical enough for net-2.6
>
> This is a stable candidate, bug is more than 2 years old.
>
> Thanks
>
> commit f216f082b2b37c4943f1e7c393e2786648d48f6f
> ([NETFILTER]: bridge netfilter: deal with martians correctly)
> added a refcount leak on in_dev.
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> ---
> diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
> index 4fde742..c62eca3 100644
> --- a/net/bridge/br_netfilter.c
> +++ b/net/bridge/br_netfilter.c
> @@ -386,6 +386,7 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
> dst_release((struct dst_entry *)rt);
> }
> free_skb:
> + in_dev_put(in_dev);
> kfree_skb(skb);
> return 0;
I guess we could simply use __in_dev_get_rcu() here since all
netfilter hooks are running under rcu_read_lock() anyways.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] netfilter: bridge: refcount fix
2009-08-24 17:22 ` Patrick McHardy
@ 2009-08-24 17:32 ` Eric Dumazet
2009-08-24 17:38 ` Patrick McHardy
0 siblings, 1 reply; 4+ messages in thread
From: Eric Dumazet @ 2009-08-24 17:32 UTC (permalink / raw)
To: Patrick McHardy; +Cc: David S. Miller, Linux Netdev List, Bart De Schuymer
Patrick McHardy a écrit :
> Eric Dumazet wrote:
>> Hi David
>>
>> I found following by code review only, I am not sure it is critical enough for net-2.6
>>
>> This is a stable candidate, bug is more than 2 years old.
>>
>> Thanks
>>
>> commit f216f082b2b37c4943f1e7c393e2786648d48f6f
>> ([NETFILTER]: bridge netfilter: deal with martians correctly)
>> added a refcount leak on in_dev.
>>
>> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
>> ---
>> diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
>> index 4fde742..c62eca3 100644
>> --- a/net/bridge/br_netfilter.c
>> +++ b/net/bridge/br_netfilter.c
>> @@ -386,6 +386,7 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
>> dst_release((struct dst_entry *)rt);
>> }
>> free_skb:
>> + in_dev_put(in_dev);
>> kfree_skb(skb);
>> return 0;
>
> I guess we could simply use __in_dev_get_rcu() here since all
> netfilter hooks are running under rcu_read_lock() anyways.
Ah very good point, Thanks Patrick.
[PATCH] netfilter: bridge: refcount fix
commit f216f082b2b37c4943f1e7c393e2786648d48f6f
([NETFILTER]: bridge netfilter: deal with martians correctly)
added a refcount leak on in_dev.
Instead of using in_dev_get(), we can use __in_dev_get_rcu(),
as netfilter hooks are running under rcu_read_lock(), as pointed
by Patrick.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 4fde742..907a82e 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -359,7 +359,7 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
},
.proto = 0,
};
- struct in_device *in_dev = in_dev_get(dev);
+ struct in_device *in_dev = __in_dev_get_rcu(dev);
/* If err equals -EHOSTUNREACH the error is due to a
* martian destination or due to the fact that
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] netfilter: bridge: refcount fix
2009-08-24 17:32 ` Eric Dumazet
@ 2009-08-24 17:38 ` Patrick McHardy
0 siblings, 0 replies; 4+ messages in thread
From: Patrick McHardy @ 2009-08-24 17:38 UTC (permalink / raw)
To: Eric Dumazet; +Cc: David S. Miller, Linux Netdev List, Bart De Schuymer
Eric Dumazet wrote:
> [PATCH] netfilter: bridge: refcount fix
>
> commit f216f082b2b37c4943f1e7c393e2786648d48f6f
> ([NETFILTER]: bridge netfilter: deal with martians correctly)
> added a refcount leak on in_dev.
>
> Instead of using in_dev_get(), we can use __in_dev_get_rcu(),
> as netfilter hooks are running under rcu_read_lock(), as pointed
> by Patrick.
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> Signed-off-by: Patrick McHardy <kaber@trash.net>
I've applied it to nf-next-2.6.git since its not as EARTH SHATTERING
as I understood Dave would like it to be for consideration for
net-2.6.git :)
Thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-08-24 17:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-24 17:18 [PATCH] netfilter: bridge: refcount fix Eric Dumazet
2009-08-24 17:22 ` Patrick McHardy
2009-08-24 17:32 ` Eric Dumazet
2009-08-24 17:38 ` Patrick McHardy
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).