Pārlūkot izejas kodu

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>
Pablo Neira Ayuso 11 gadi atpakaļ
vecāks
revīzija
fc04733a1a
1 mainītis faili ar 3 papildinājumiem un 3 dzēšanām
  1. 3 3
      net/netfilter/nfnetlink.c

+ 3 - 3
net/netfilter/nfnetlink.c

@@ -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);