* [PATCH v2] netfilter: nf_conntrack_bridge: Fix memory leak when error
@ 2021-07-29 7:46 Yajun Deng
2021-07-29 8:08 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Yajun Deng @ 2021-07-29 7:46 UTC (permalink / raw)
To: pablo, kadlec, fw
Cc: netfilter-devel, coreteam, bridge, netdev, linux-kernel, Yajun Deng
It should be added kfree_skb_list() when err is not equal to zero
in nf_br_ip_fragment().
v2: keep this aligned with IPv6.
Fixes: 3c171f496ef5 ("netfilter: bridge: add connection tracking system")
Signed-off-by: Yajun Deng <yajun.deng@linux.dev>
---
net/bridge/netfilter/nf_conntrack_bridge.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/net/bridge/netfilter/nf_conntrack_bridge.c b/net/bridge/netfilter/nf_conntrack_bridge.c
index 8d033a75a766..3cf5457919c6 100644
--- a/net/bridge/netfilter/nf_conntrack_bridge.c
+++ b/net/bridge/netfilter/nf_conntrack_bridge.c
@@ -88,6 +88,11 @@ static int nf_br_ip_fragment(struct net *net, struct sock *sk,
skb = ip_fraglist_next(&iter);
}
+
+ if (!err)
+ return 0;
+
+ kfree_skb_list(iter.frag_list);
return err;
}
slow_path:
--
2.32.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] netfilter: nf_conntrack_bridge: Fix memory leak when error
2021-07-29 7:46 [PATCH v2] netfilter: nf_conntrack_bridge: Fix memory leak when error Yajun Deng
@ 2021-07-29 8:08 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2021-07-29 8:08 UTC (permalink / raw)
To: Yajun Deng
Cc: kadlec, fw, netfilter-devel, coreteam, bridge, netdev, linux-kernel
On Thu, Jul 29, 2021 at 03:46:58PM +0800, Yajun Deng wrote:
> It should be added kfree_skb_list() when err is not equal to zero
> in nf_br_ip_fragment().
>
> v2: keep this aligned with IPv6.
>
> Fixes: 3c171f496ef5 ("netfilter: bridge: add connection tracking system")
> Signed-off-by: Yajun Deng <yajun.deng@linux.dev>
> ---
> net/bridge/netfilter/nf_conntrack_bridge.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/net/bridge/netfilter/nf_conntrack_bridge.c b/net/bridge/netfilter/nf_conntrack_bridge.c
> index 8d033a75a766..3cf5457919c6 100644
> --- a/net/bridge/netfilter/nf_conntrack_bridge.c
> +++ b/net/bridge/netfilter/nf_conntrack_bridge.c
> @@ -88,6 +88,11 @@ static int nf_br_ip_fragment(struct net *net, struct sock *sk,
>
> skb = ip_fraglist_next(&iter);
> }
> +
> + if (!err)
> + return 0;
> +
> + kfree_skb_list(iter.frag_list);
Actually:
kfree_skb_list(iter.frag);
I used frag_list instead of frag in my snippet.
> return err;
> }
> slow_path:
> --
> 2.32.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-29 8:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-29 7:46 [PATCH v2] netfilter: nf_conntrack_bridge: Fix memory leak when error Yajun Deng
2021-07-29 8:08 ` 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).