Merge tag 'v3.10.81' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / ipv4 / route.c

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 577801102a70c799156a4614e942d7a1d071876b..52fceb025a7201abe30d9e03373056da1fc28c88 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -873,6 +873,10 @@ static int ip_error(struct sk_buff *skb)
        bool send;
        int code;
 
+       /* IP on this device is disabled. */
+       if (!in_dev)
+               goto out;
+
        net = dev_net(rt->dst.dev);
        if (!IN_DEV_FORWARD(in_dev)) {
                switch (rt->dst.error) {