Commit 8e36360a authored by David S. Miller's avatar David S. Miller
Browse files

ipv4: Remove route key identity dependencies in ip_rt_get_source(). 



Pass in the sk_buff so that we can fetch the necessary keys from
the packet header when working with input routes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 22f728f8

include/net/route.h

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ extern unsigned inet_addr_type(struct net *net, __be32 addr); 
extern unsigned		inet_dev_addr_type(struct net *net, const struct net_device *dev, __be32 addr);

extern void		ip_rt_multicast_event(struct in_device *);

extern int		ip_rt_ioctl(struct net *, unsigned int cmd, void __user *arg);

extern void		ip_rt_get_source(u8 *src, struct rtable *rt);

extern void		ip_rt_get_source(u8 *src, struct sk_buff *skb, struct rtable *rt);

extern int		ip_rt_dump(struct sk_buff *skb,  struct netlink_callback *cb);



struct in_ifaddr;

net/ipv4/ip_options.c

+6 −6
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ void ip_options_build(struct sk_buff *skb, struct ip_options *opt, 


	if (!is_frag) {

		if (opt->rr_needaddr)

			ip_rt_get_source(iph+opt->rr+iph[opt->rr+2]-5, rt);

			ip_rt_get_source(iph+opt->rr+iph[opt->rr+2]-5, skb, rt);

		if (opt->ts_needaddr)

			ip_rt_get_source(iph+opt->ts+iph[opt->ts+2]-9, rt);

			ip_rt_get_source(iph+opt->ts+iph[opt->ts+2]-9, skb, rt);

		if (opt->ts_needtime) {

			struct timespec tv;

			__be32 midtime;
@@ -553,7 +553,7 @@ void ip_forward_options(struct sk_buff *skb) 


	if (opt->rr_needaddr) {

		optptr = (unsigned char *)raw + opt->rr;

		ip_rt_get_source(&optptr[optptr[2]-5], rt);

		ip_rt_get_source(&optptr[optptr[2]-5], skb, rt);

		opt->is_changed = 1;

	}

	if (opt->srr_is_hit) {
@@ -572,13 +572,13 @@ void ip_forward_options(struct sk_buff *skb) 
		}

		if (srrptr + 3 <= srrspace) {

			opt->is_changed = 1;

			ip_rt_get_source(&optptr[srrptr-1], rt);

			ip_rt_get_source(&optptr[srrptr-1], skb, rt);

			optptr[2] = srrptr+4;

		} else if (net_ratelimit())

			printk(KERN_CRIT "ip_forward(): Argh! Destination lost!\n");

		if (opt->ts_needaddr) {

			optptr = raw + opt->ts;

			ip_rt_get_source(&optptr[optptr[2]-9], rt);

			ip_rt_get_source(&optptr[optptr[2]-9], skb, rt);

			opt->is_changed = 1;

		}

	}

net/ipv4/route.c

+14 −10
Original line number Diff line number Diff line
@@ -1699,22 +1699,26 @@ static int ip_rt_bug(struct sk_buff *skb) 
   in IP options!

 */



void ip_rt_get_source(u8 *addr, struct rtable *rt)

void ip_rt_get_source(u8 *addr, struct sk_buff *skb, struct rtable *rt)

{

	__be32 src;

	struct fib_result res;



	if (rt_is_output_route(rt))

		src = rt->rt_src;

	else {

		struct flowi4 fl4 = {

			.daddr = rt->rt_key_dst,

			.saddr = rt->rt_key_src,

			.flowi4_tos = rt->rt_key_tos,

			.flowi4_oif = rt->rt_oif,

			.flowi4_iif = rt->rt_iif,

			.flowi4_mark = rt->rt_mark,

		};

		struct fib_result res;

		struct flowi4 fl4;

		struct iphdr *iph;



		iph = ip_hdr(skb);



		memset(&fl4, 0, sizeof(fl4));

		fl4.daddr = iph->daddr;

		fl4.saddr = iph->saddr;

		fl4.flowi4_tos = iph->tos;

		fl4.flowi4_oif = rt->dst.dev->ifindex;

		fl4.flowi4_iif = skb->dev->ifindex;

		fl4.flowi4_mark = skb->mark;



		rcu_read_lock();

		if (fib_lookup(dev_net(rt->dst.dev), &fl4, &res) == 0)