Commit 28f8bfd1 authored by Phil Sutter's avatar Phil Sutter Committed by Pablo Neira Ayuso
Browse files

netfilter: Support iif matches in POSTROUTING 



Instead of generally passing NULL to NF_HOOK_COND() for input device,
pass skb->dev which contains input device for routed skbs.

Note that iptables (both legacy and nft) reject rules with input
interface match from being added to POSTROUTING chains, but nftables
allows this.

Cc: Eric Garver <eric@garver.life>
Signed-off-by: default avatarPhil Sutter <phil@nwl.cc>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 5c27d8d7

net/ipv4/ip_output.c

+2 −2
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ int ip_mc_output(struct net *net, struct sock *sk, struct sk_buff *skb) 


int ip_output(struct net *net, struct sock *sk, struct sk_buff *skb)

{

	struct net_device *dev = skb_dst(skb)->dev;

	struct net_device *dev = skb_dst(skb)->dev, *indev = skb->dev;



	IP_UPD_PO_STATS(net, IPSTATS_MIB_OUT, skb->len);
@@ -430,7 +430,7 @@ int ip_output(struct net *net, struct sock *sk, struct sk_buff *skb) 
	skb->protocol = htons(ETH_P_IP);



	return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING,

			    net, sk, skb, NULL, dev,

			    net, sk, skb, indev, dev,

			    ip_finish_output,

			    !(IPCB(skb)->flags & IPSKB_REROUTED));

}

net/ipv4/xfrm4_output.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int __xfrm4_output(struct net *net, struct sock *sk, struct sk_buff *skb) 
int xfrm4_output(struct net *net, struct sock *sk, struct sk_buff *skb)

{

	return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING,

			    net, sk, skb, NULL, skb_dst(skb)->dev,

			    net, sk, skb, skb->dev, skb_dst(skb)->dev,

			    __xfrm4_output,

			    !(IPCB(skb)->flags & IPSKB_REROUTED));

}

net/ipv6/ip6_output.c

+2 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int ip6_finish_output(struct net *net, struct sock *sk, struct sk_buff *s 


int ip6_output(struct net *net, struct sock *sk, struct sk_buff *skb)

{

	struct net_device *dev = skb_dst(skb)->dev;

	struct net_device *dev = skb_dst(skb)->dev, *indev = skb->dev;

	struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));



	skb->protocol = htons(ETH_P_IPV6);
@@ -173,7 +173,7 @@ int ip6_output(struct net *net, struct sock *sk, struct sk_buff *skb) 
	}



	return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING,

			    net, sk, skb, NULL, dev,

			    net, sk, skb, indev, dev,

			    ip6_finish_output,

			    !(IP6CB(skb)->flags & IP6SKB_REROUTED));

}

net/ipv6/xfrm6_output.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ skip_frag: 
int xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb)

{

	return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING,

			    net, sk, skb,  NULL, skb_dst(skb)->dev,

			    net, sk, skb,  skb->dev, skb_dst(skb)->dev,

			    __xfrm6_output,

			    !(IP6CB(skb)->flags & IP6SKB_REROUTED));

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE