Commit 61b95c70 authored by Menglong Dong's avatar Menglong Dong Committed by Paolo Abeni
Browse files

net: ip: make ip_route_input_rcu() return drop reasons 



In this commit, we make ip_route_input_rcu() return drop reasons, which
come from ip_route_input_mc() and ip_route_input_slow().

The only caller of ip_route_input_rcu() is ip_route_input_noref(). We
adjust it by making it return -EINVAL on error and ignore the reasons that
ip_route_input_rcu() returns. In the following patch, we will make
ip_route_input_noref() returns the drop reasons.

Signed-off-by: default avatarMenglong Dong <dongml2@chinatelecom.cn>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 5b92112a

net/ipv4/route.c

+10 −9
Original line number Diff line number Diff line
@@ -2448,7 +2448,8 @@ ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, 
}



/* called with rcu_read_lock held */

static int ip_route_input_rcu(struct sk_buff *skb, __be32 daddr, __be32 saddr,

static enum skb_drop_reason

ip_route_input_rcu(struct sk_buff *skb, __be32 daddr, __be32 saddr,

		   dscp_t dscp, struct net_device *dev,

		   struct fib_result *res)

{
@@ -2493,23 +2494,23 @@ static int ip_route_input_rcu(struct sk_buff *skb, __be32 daddr, __be32 saddr, 
			reason = ip_route_input_mc(skb, daddr, saddr, dscp,

						   dev, our);

		}

		return reason ? -EINVAL : 0;

		return reason;

	}



	return ip_route_input_slow(skb, daddr, saddr, dscp, dev, res) ? -EINVAL : 0;

	return ip_route_input_slow(skb, daddr, saddr, dscp, dev, res);

}



int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr,

			 dscp_t dscp, struct net_device *dev)

{

	enum skb_drop_reason reason;

	struct fib_result res;

	int err;



	rcu_read_lock();

	err = ip_route_input_rcu(skb, daddr, saddr, dscp, dev, &res);

	reason = ip_route_input_rcu(skb, daddr, saddr, dscp, dev, &res);

	rcu_read_unlock();



	return err;

	return reason ? -EINVAL : 0;

}

EXPORT_SYMBOL(ip_route_input_noref);
@@ -3321,7 +3322,7 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, 
		skb->mark	= mark;

		err = ip_route_input_rcu(skb, dst, src,

					 inet_dsfield_to_dscp(rtm->rtm_tos),

					 dev, &res);

					 dev, &res) ? -EINVAL : 0;



		rt = skb_rtable(skb);

		if (err == 0 && rt->dst.error)