From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: kaber@trash.net, arturo.borrero.glez@gmail.com
Subject: [PATCH nf-next 2/3] netfilter: nfnetlink: use original skbuff when committing/aborting
Date: Thu, 11 Sep 2014 17:20:18 +0200 [thread overview]
Message-ID: <1410448819-6694-2-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1410448819-6694-1-git-send-email-pablo@netfilter.org>
This allows us to access the original content of the batch from
the commit and the abort paths.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nfnetlink.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index c138b8f..dfc1a61 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -357,9 +357,9 @@ ack:
}
done:
if (success && done)
- ss->commit(skb);
+ ss->commit(oskb);
else
- ss->abort(skb);
+ ss->abort(oskb);
nfnl_unlock(subsys_id);
kfree_skb(nskb);
--
1.7.10.4
next prev parent reply other threads:[~2014-09-11 15:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-11 15:20 [PATCH nf-next 1/3] netfilter: nf_tables: add NFTA_MASQ_UNSPEC to nft_masq_attributes Pablo Neira Ayuso
2014-09-11 15:20 ` Pablo Neira Ayuso [this message]
2014-09-11 15:20 ` [PATCH nf-next 3/3 v2] netfilter: nf_tables: export rule-set generation ID Pablo Neira Ayuso
2014-09-11 15:32 ` Patrick McHardy
2014-09-11 16:10 ` Pablo Neira Ayuso
2014-09-11 16:45 ` Patrick McHardy
2014-09-11 16:57 ` Pablo Neira Ayuso
2014-09-11 17:22 ` Pablo Neira Ayuso
2014-09-11 17:35 ` Patrick McHardy
2014-09-12 7:47 ` Pablo Neira Ayuso
2014-09-11 15:46 ` Arturo Borrero Gonzalez
2014-09-11 16:25 ` 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=1410448819-6694-2-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=arturo.borrero.glez@gmail.com \
--cc=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.org \
/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 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).