From: Yajun Deng <yajun.deng@linux.dev>
To: pablo@netfilter.org, kadlec@netfilter.org, fw@strlen.de,
roopa@nvidia.com, nikolay@nvidia.com, davem@davemloft.net,
kuba@kernel.org
Cc: netdev@vger.kernel.org, bridge@lists.linux-foundation.org,
linux-kernel@vger.kernel.org, coreteam@netfilter.org,
Yajun Deng <yajun.deng@linux.dev>,
netfilter-devel@vger.kernel.org
Subject: [Bridge] [PATCH] netfilter: nf_conntrack_bridge: Fix not free when error
Date: Mon, 26 Jul 2021 11:57:02 +0800 [thread overview]
Message-ID: <20210726035702.11964-1-yajun.deng@linux.dev> (raw)
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
WARNING: multiple messages have this Message-ID (diff)
From: Yajun Deng <yajun.deng@linux.dev>
To: pablo@netfilter.org, kadlec@netfilter.org, fw@strlen.de,
roopa@nvidia.com, nikolay@nvidia.com, davem@davemloft.net,
kuba@kernel.org
Cc: netfilter-devel@vger.kernel.org, coreteam@netfilter.org,
bridge@lists.linux-foundation.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Yajun Deng <yajun.deng@linux.dev>
Subject: [PATCH] netfilter: nf_conntrack_bridge: Fix not free when error
Date: Mon, 26 Jul 2021 11:57:02 +0800 [thread overview]
Message-ID: <20210726035702.11964-1-yajun.deng@linux.dev> (raw)
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
next reply other threads:[~2021-07-26 3:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-26 3:57 Yajun Deng [this message]
2021-07-26 3:57 ` [PATCH] netfilter: nf_conntrack_bridge: Fix not free when error Yajun Deng
2021-07-28 16:18 ` [Bridge] " Pablo Neira Ayuso
2021-07-28 16:18 ` Pablo Neira Ayuso
2021-07-29 3:19 ` [Bridge] " yajun.deng
2021-07-29 3:19 ` yajun.deng
2021-07-29 7:24 ` [Bridge] " Pablo Neira Ayuso
2021-07-29 7:24 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210726035702.11964-1-yajun.deng@linux.dev \
--to=yajun.deng@linux.dev \
--cc=bridge@lists.linux-foundation.org \
--cc=coreteam@netfilter.org \
--cc=davem@davemloft.net \
--cc=fw@strlen.de \
--cc=kadlec@netfilter.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=nikolay@nvidia.com \
--cc=pablo@netfilter.org \
--cc=roopa@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.