Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] netfilter: nf_conntrack_bridge: Fix not free when error
@ 2021-07-26  3:57 Yajun Deng
  2021-07-28 16:18 ` Pablo Neira Ayuso
  2021-07-29  3:19 ` yajun.deng
  0 siblings, 2 replies; 4+ messages in thread
From: Yajun Deng @ 2021-07-26  3:57 UTC (permalink / raw)
  To: pablo, kadlec, fw, roopa, nikolay, davem, kuba
  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().

Fixes: 3c171f496ef5 ("netfilter: bridge: add connection tracking system")
Signed-off-by: Yajun Deng <yajun.deng@linux.dev>
---
 net/bridge/netfilter/nf_conntrack_bridge.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/net/bridge/netfilter/nf_conntrack_bridge.c b/net/bridge/netfilter/nf_conntrack_bridge.c
index 8d033a75a766..059f53903eda 100644
--- a/net/bridge/netfilter/nf_conntrack_bridge.c
+++ b/net/bridge/netfilter/nf_conntrack_bridge.c
@@ -83,12 +83,16 @@ static int nf_br_ip_fragment(struct net *net, struct sock *sk,
 
 			skb->tstamp = tstamp;
 			err = output(net, sk, data, skb);
-			if (err || !iter.frag)
-				break;
-
+			if (err) {
+				kfree_skb_list(iter.frag);
+				return err;
+			}
+
+			if (!iter.frag)
+				return 0;
+
 			skb = ip_fraglist_next(&iter);
 		}
-		return err;
 	}
 slow_path:
 	/* This is a linearized skbuff, the original geometry is lost for us.
-- 
2.32.0


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-07-29  7:24 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-26  3:57 [PATCH] netfilter: nf_conntrack_bridge: Fix not free when error Yajun Deng
2021-07-28 16:18 ` Pablo Neira Ayuso
2021-07-29  3:19 ` yajun.deng
2021-07-29  7: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).