diff options
| author | Stephen Suryaputra <ssuryaextr@gmail.com> | 2019-04-01 15:17:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-01 19:44:58 +0200 |
| commit | 8c83f2df9c6578ea4c5b940d8238ad8a41b87e9e (patch) | |
| tree | 25b10b6f99295706111c3cbd972cac15a7e8ced1 /net/ipv4/ip_options.c | |
| parent | MAINTAINERS: net: update Solarflare maintainers (diff) | |
| download | linux-8c83f2df9c6578ea4c5b940d8238ad8a41b87e9e.tar.xz linux-8c83f2df9c6578ea4c5b940d8238ad8a41b87e9e.zip | |
vrf: check accept_source_route on the original netdevice
Configuration check to accept source route IP options should be made on
the incoming netdevice when the skb->dev is an l3mdev master. The route
lookup for the source route next hop also needs the incoming netdev.
v2->v3:
- Simplify by passing the original netdevice down the stack (per David
Ahern).
Signed-off-by: Stephen Suryaputra <ssuryaextr@gmail.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_options.c')
| -rw-r--r-- | net/ipv4/ip_options.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index 32a35043c9f5..3db31bb9df50 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c @@ -612,7 +612,7 @@ void ip_forward_options(struct sk_buff *skb) } } -int ip_options_rcv_srr(struct sk_buff *skb) +int ip_options_rcv_srr(struct sk_buff *skb, struct net_device *dev) { struct ip_options *opt = &(IPCB(skb)->opt); int srrspace, srrptr; @@ -647,7 +647,7 @@ int ip_options_rcv_srr(struct sk_buff *skb) orefdst = skb->_skb_refdst; skb_dst_set(skb, NULL); - err = ip_route_input(skb, nexthop, iph->saddr, iph->tos, skb->dev); + err = ip_route_input(skb, nexthop, iph->saddr, iph->tos, dev); rt2 = skb_rtable(skb); if (err || (rt2->rt_type != RTN_UNICAST && rt2->rt_type != RTN_LOCAL)) { skb_dst_drop(skb); |