Commit fc04733a authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso

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: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent fcfa8f49
...@@ -333,7 +333,7 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -333,7 +333,7 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh,
* 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 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh, ...@@ -357,9 +357,9 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh,
} }
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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment