netfilter: ingress: fix wrong input interface on hook

ummakynes · ummakynes · commit b4865988eab5 · 2015-11-06T19:33:12.000+01:00
The input and output interfaces in nf_hook_state_init() are flipped.
This fixes iif matching on nftables.

Reported-by: Patrick McHardy &lt;kaber@trash.net&gt;
Signed-off-by: Pablo Neira Ayuso &lt;pablo@netfilter.org&gt;
diff --git a/include/linux/netfilter_ingress.h b/include/linux/netfilter_ingress.h
@@ -19,8 +19,8 @@ static inline int nf_hook_ingress(struct sk_buff *skb)
 	struct nf_hook_state state;
 
 	nf_hook_state_init(&state, &skb->dev->nf_hooks_ingress,
-			   NF_NETDEV_INGRESS, INT_MIN, NFPROTO_NETDEV, NULL,
-			   skb->dev, NULL, dev_net(skb->dev), NULL);
+			   NF_NETDEV_INGRESS, INT_MIN, NFPROTO_NETDEV,
+			   skb->dev, NULL, NULL, dev_net(skb->dev), NULL);
 	return nf_hook_slow(skb, &state);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ static inline int nf_hook_ingress(struct sk_buff *skb)`
`19`	`19`	`struct nf_hook_state state;`
`20`	`20`
`21`	`21`	`nf_hook_state_init(&state, &skb->dev->nf_hooks_ingress,`
`22`		`- NF_NETDEV_INGRESS, INT_MIN, NFPROTO_NETDEV, NULL,`
`23`		`- skb->dev, NULL, dev_net(skb->dev), NULL);`
	`22`	`+ NF_NETDEV_INGRESS, INT_MIN, NFPROTO_NETDEV,`
	`23`	`+ skb->dev, NULL, NULL, dev_net(skb->dev), NULL);`
`24`	`24`	`return nf_hook_slow(skb, &state);`
`25`	`25`	`}`
`26`	`26`