Commit d6f64d72 authored by Mark Tomlinson's avatar Mark Tomlinson Committed by David S. Miller
Browse files

net: VRF: Pass original iif to ip_route_input() 



The function ip_rcv_finish() calls l3mdev_ip_rcv(). On any VRF except
the global VRF, this replaces skb->dev with the VRF master interface.
When calling ip_route_input_noref() from here, the checks for forwarding
look at this master device instead of the initial ingress interface.
This will allow packets to be routed which normally would be dropped.
For example, an interface that is not assigned an IP address should
drop packets, but because the checking is against the master device, the
packet will be forwarded.

The fix here is to still call l3mdev_ip_rcv(), but remember the initial
net_device. This is passed to the other functions within ip_rcv_finish,
so they still see the original interface.

Signed-off-by: default avatarMark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>
Acked-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7106a069

net/ipv4/ip_input.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -312,6 +312,7 @@ static int ip_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb) 
{

{

	const struct iphdr *iph = ip_hdr(skb);

	const struct iphdr *iph = ip_hdr(skb);

	struct rtable *rt;

	struct rtable *rt;

	struct net_device *dev = skb->dev;





	/* if ingress device is enslaved to an L3 master device pass the

	/* if ingress device is enslaved to an L3 master device pass the

	 * skb to its handler for processing

	 * skb to its handler for processing
@@ -341,7 +342,7 @@ static int ip_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb) 
	 */

	 */

	if (!skb_valid_dst(skb)) {

	if (!skb_valid_dst(skb)) {

		int err = ip_route_input_noref(skb, iph->daddr, iph->saddr,

		int err = ip_route_input_noref(skb, iph->daddr, iph->saddr,

					       iph->tos, skb->dev);

					       iph->tos, dev);

		if (unlikely(err)) {

		if (unlikely(err)) {

			if (err == -EXDEV)

			if (err == -EXDEV)

				__NET_INC_STATS(net, LINUX_MIB_IPRPFILTER);

				__NET_INC_STATS(net, LINUX_MIB_IPRPFILTER);
@@ -370,7 +371,7 @@ static int ip_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb) 
		__IP_UPD_PO_STATS(net, IPSTATS_MIB_INBCAST, skb->len);

		__IP_UPD_PO_STATS(net, IPSTATS_MIB_INBCAST, skb->len);

	} else if (skb->pkt_type == PACKET_BROADCAST ||

	} else if (skb->pkt_type == PACKET_BROADCAST ||

		   skb->pkt_type == PACKET_MULTICAST) {

		   skb->pkt_type == PACKET_MULTICAST) {

		struct in_device *in_dev = __in_dev_get_rcu(skb->dev);

		struct in_device *in_dev = __in_dev_get_rcu(dev);





		/* RFC 1122 3.3.6:

		/* RFC 1122 3.3.6:

		 *

		 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE