Skip to content

Commit

Permalink
netfilter: nfnetlink: use original skbuff when committing/aborting
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pablo Neira Ayuso committed Sep 19, 2014
1 parent fcfa8f4 commit fc04733
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/netfilter/nfnetlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh,
* original skb.
*/
if (err == -EAGAIN) {
ss->abort(skb);
ss->abort(oskb);
nfnl_unlock(subsys_id);
kfree_skb(nskb);
goto replay;
Expand All @@ -357,9 +357,9 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh,
}
done:
if (success && done)
ss->commit(skb);
ss->commit(oskb);
else
ss->abort(skb);
ss->abort(oskb);

nfnl_unlock(subsys_id);
kfree_skb(nskb);
Expand Down

0 comments on commit fc04733

Please sign in to comment.