* [PATCH nf v2 1/1] netfilter: xt_CT: Fix one possible memleak of timeout
@ 2017-04-06 11:19 gfree.wind
2017-04-13 22:24 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: gfree.wind @ 2017-04-06 11:19 UTC (permalink / raw)
To: pablo, netfilter-devel; +Cc: Gao Feng
From: Gao Feng <fgao@ikuai8.com>
When nf_ct_timeout_ext_add failed in xt_ct_set_timeout, it should
free the timeout refcnt.
Now goto the err_put_timeout error handler instead of going ahead.
Signed-off-by: Gao Feng <fgao@ikuai8.com>
---
v2: Keep the ret = -ENOMEM, per Gao Feng
v1: initial version
net/netfilter/xt_CT.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c
index b008db0..a1783b6 100644
--- a/net/netfilter/xt_CT.c
+++ b/net/netfilter/xt_CT.c
@@ -167,8 +167,10 @@ static void __xt_ct_tg_timeout_put(struct ctnl_timeout *timeout)
goto err_put_timeout;
}
timeout_ext = nf_ct_timeout_ext_add(ct, timeout, GFP_ATOMIC);
- if (timeout_ext == NULL)
+ if (!timeout_ext) {
ret = -ENOMEM;
+ goto err_put_timeout;
+ }
rcu_read_unlock();
return ret;
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH nf v2 1/1] netfilter: xt_CT: Fix one possible memleak of timeout
2017-04-06 11:19 [PATCH nf v2 1/1] netfilter: xt_CT: Fix one possible memleak of timeout gfree.wind
@ 2017-04-13 22:24 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2017-04-13 22:24 UTC (permalink / raw)
To: gfree.wind; +Cc: netfilter-devel, Gao Feng
On Thu, Apr 06, 2017 at 07:19:34PM +0800, gfree.wind@foxmail.com wrote:
> From: Gao Feng <fgao@ikuai8.com>
>
> When nf_ct_timeout_ext_add failed in xt_ct_set_timeout, it should
> free the timeout refcnt.
>
> Now goto the err_put_timeout error handler instead of going ahead.
>
> Signed-off-by: Gao Feng <fgao@ikuai8.com>
> ---
> v2: Keep the ret = -ENOMEM, per Gao Feng
> v1: initial version
>
> net/netfilter/xt_CT.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c
> index b008db0..a1783b6 100644
> --- a/net/netfilter/xt_CT.c
> +++ b/net/netfilter/xt_CT.c
> @@ -167,8 +167,10 @@ static void __xt_ct_tg_timeout_put(struct ctnl_timeout *timeout)
> goto err_put_timeout;
> }
> timeout_ext = nf_ct_timeout_ext_add(ct, timeout, GFP_ATOMIC);
> - if (timeout_ext == NULL)
> + if (!timeout_ext) {
> ret = -ENOMEM;
> + goto err_put_timeout;
> + }
This also needs to be fixed, just a few line after this:
timeout_ext = nf_ct_timeout_ext_add(ct, timeout, GFP_ATOMIC);
if (timeout_ext == NULL)
ret = -ENOMEM;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-04-13 22:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-06 11:19 [PATCH nf v2 1/1] netfilter: xt_CT: Fix one possible memleak of timeout gfree.wind
2017-04-13 22:24 ` Pablo Neira Ayuso
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).