vrf: check forwarding on the original netdevice when generating ICMP dest unreachable
Subsystems (3)
PATCH v3 1/1 vrf: check forwarding on the original netdevice when generating ICMP dest unreachable
When ip_error() is called the device is the l3mdev master instead of the original device. So the forwarding check should be on the original one.
Changes from v2:
- Handle the original device disappearing (per David Ahern)
- Minimize the change in code order
Changes from v1:
- Only need to reset the device on which __in_dev_get_rcu() is done (per David Ahern).
--- net/ipv4/route.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
net/ipv4/route.c +10 -1
@@ -930,14 +930,23 @@ void ip_rt_send_redirect(struct sk_buff *skb)static int ip_error (struct sk_buff *skb) { -struct in_device *in_dev =__in_dev_get_rcu (skb->dev);struct rtable *rt =skb_rtable (skb); +struct net_device *dev = skb->dev; +struct in_device *in_dev;struct inet_peer *peer;unsigned long now;struct net *net;bool send;int code; +if (netif_is_l3_master (skb->dev)) { + dev =__dev_get_by_index (dev_net (skb->dev),IPCB (skb)->iif); +if (!dev) + goto out; + } + + in_dev =__in_dev_get_rcu (dev); +/* IP on this device is disabled. */ if (!in_dev) goto out;
Signature · 1 line
2.7.4
Quoted 7 lines · Stephen Suryaputra
When
ip_error()is called the device is the l3mdev master instead of the original device. So the forwarding check should be on the original one.Changes from v2:
- Handle the original device disappearing (per David Ahern)
- Minimize the change in code order
Quoted 9 lines
Changes from v1:
- Only need to reset the device on which__in_dev_get_rcu()is done (per David Ahern).Signed-off-by Stephen Suryaputra <[email protected]>--- net/ipv4/route.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)