diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-09-11 08:53:17 -0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-09-19 05:14:42 -0400 |
commit | fc04733a1a71af26bf30830571b71f5f2a354a06 (patch) | |
tree | b0e6849eea7d2657f3c9e8caf3aa11d4bb32b5e1 /net/netfilter | |
parent | fcfa8f493f4b52b99c29067c4eed8887af9ed951 (diff) |
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: | |||
333 | * original skb. | 333 | * original skb. |
334 | */ | 334 | */ |
335 | if (err == -EAGAIN) { | 335 | if (err == -EAGAIN) { |
336 | ss->abort(skb); | 336 | ss->abort(oskb); |
337 | nfnl_unlock(subsys_id); | 337 | nfnl_unlock(subsys_id); |
338 | kfree_skb(nskb); | 338 | kfree_skb(nskb); |
339 | goto replay; | 339 | goto replay; |
@@ -357,9 +357,9 @@ ack: | |||
357 | } | 357 | } |
358 | done: | 358 | done: |
359 | if (success && done) | 359 | if (success && done) |
360 | ss->commit(skb); | 360 | ss->commit(oskb); |
361 | else | 361 | else |
362 | ss->abort(skb); | 362 | ss->abort(oskb); |
363 | 363 | ||
364 | nfnl_unlock(subsys_id); | 364 | nfnl_unlock(subsys_id); |
365 | kfree_skb(nskb); | 365 | kfree_skb(nskb); |