Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

net/netfilter/nfnetlink.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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);