2021-07-29 07:51:15

by Yajun Deng

Subject: [PATCH v2] netfilter: nf_conntrack_bridge: Fix memory leak when error

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 <[email protected]>
---
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

2021-07-29 08:10:48

by Pablo Neira Ayuso

Subject: Re: [PATCH v2] netfilter: nf_conntrack_bridge: Fix memory leak when error

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 <[email protected]>
> ---
> 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
>