diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2014-09-11 14:53:17 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-09-19 11:14:42 +0200 |
| commit | fc04733a1a71af26bf30830571b71f5f2a354a06 (patch) | |
| tree | b0e6849eea7d2657f3c9e8caf3aa11d4bb32b5e1 /net/netfilter | |
| parent | Merge branch 'ipvs-next' (diff) | |
| download | linux-dev-fc04733a1a71af26bf30830571b71f5f2a354a06.tar.xz linux-dev-fc04733a1a71af26bf30830571b71f5f2a354a06.zip | |
netfilter: nfnetlink: use original skbuff when committing/aborting
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>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nfnetlink.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index c138b8fbe280..f77d3f7f22b5 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -333,7 +333,7 @@ replay: * original skb. */ if (err == -EAGAIN) { - ss->abort(skb); + ss->abort(oskb); nfnl_unlock(subsys_id); kfree_skb(nskb); goto replay; @@ -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); |