aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_options.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/ip_options.c')
-rw-r--r--net/ipv4/ip_options.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index 4c09a31fd140..3244133c24f6 100644
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -601,6 +601,7 @@ int ip_options_rcv_srr(struct sk_buff *skb)
601 unsigned char *optptr = skb_network_header(skb) + opt->srr; 601 unsigned char *optptr = skb_network_header(skb) + opt->srr;
602 struct rtable *rt = skb_rtable(skb); 602 struct rtable *rt = skb_rtable(skb);
603 struct rtable *rt2; 603 struct rtable *rt2;
604 unsigned long orefdst;
604 int err; 605 int err;
605 606
606 if (!opt->srr) 607 if (!opt->srr)
@@ -624,16 +625,16 @@ int ip_options_rcv_srr(struct sk_buff *skb)
624 } 625 }
625 memcpy(&nexthop, &optptr[srrptr-1], 4); 626 memcpy(&nexthop, &optptr[srrptr-1], 4);
626 627
627 rt = skb_rtable(skb); 628 orefdst = skb->_skb_refdst;
628 skb_dst_set(skb, NULL); 629 skb_dst_set(skb, NULL);
629 err = ip_route_input(skb, nexthop, iph->saddr, iph->tos, skb->dev); 630 err = ip_route_input(skb, nexthop, iph->saddr, iph->tos, skb->dev);
630 rt2 = skb_rtable(skb); 631 rt2 = skb_rtable(skb);
631 if (err || (rt2->rt_type != RTN_UNICAST && rt2->rt_type != RTN_LOCAL)) { 632 if (err || (rt2->rt_type != RTN_UNICAST && rt2->rt_type != RTN_LOCAL)) {
632 ip_rt_put(rt2); 633 skb_dst_drop(skb);
633 skb_dst_set(skb, &rt->u.dst); 634 skb->_skb_refdst = orefdst;
634 return -EINVAL; 635 return -EINVAL;
635 } 636 }
636 ip_rt_put(rt); 637 refdst_drop(orefdst);
637 if (rt2->rt_type != RTN_LOCAL) 638 if (rt2->rt_type != RTN_LOCAL)
638 break; 639 break;
639 /* Superfast 8) loopback forward */ 640 /* Superfast 8) loopback forward */