netfilter: nfnetlink: use original skbuff when committing/aborting
authorPablo Neira Ayuso <pablo@netfilter.org>
Thu, 11 Sep 2014 12:53:17 +0000 (14:53 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 19 Sep 2014 09:14:42 +0000 (11:14 +0200)
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

index c138b8fbe280af6886693421a7fe8d9a288156cf..f77d3f7f22b581af8274cdbf2a9f63d3899f246e 100644 (file)
@@ -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);