mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Pablo Neira Ayuso 2014-09-11 14:53:17 +02:00
parent fcfa8f493f
commit fc04733a1a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/netfilter/nfnetlink.c
View File

@ -333,7 +333,7 @@ replay:
* original skb. * original skb.
*/ */
if (err == -EAGAIN) { if (err == -EAGAIN) {
ss->abort(skb); ss->abort(oskb);
nfnl_unlock(subsys_id); nfnl_unlock(subsys_id);
kfree_skb(nskb); kfree_skb(nskb);
goto replay; goto replay;
@ -357,9 +357,9 @@ ack:
} }
done: done:
if (success && done) if (success && done)
ss->commit(skb); ss->commit(oskb);
else else
ss->abort(skb); ss->abort(oskb);
nfnl_unlock(subsys_id); nfnl_unlock(subsys_id);
kfree_skb(nskb); kfree_skb(nskb);