aboutsummaryrefslogtreecommitdiff
path: root/net/ipv4/route.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-08-04 12:25:55 -0700
committerKevin Hilman <khilman@linaro.org>2015-08-04 12:25:55 -0700
commitfaefdddc4f71cd099a82ac24055a51438b1ee66a (patch)
tree5fafda6ea8c4cd128b8d1980184238cbb69f0688 /net/ipv4/route.c
parent0c9561b6f843fad1954e32ed780842f9b6750938 (diff)
parent69483e398f196d87ca3289f31ad3291bad94af60 (diff)
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlinux-linaro-lsk-v3.14-android-test
Diffstat (limited to 'net/ipv4/route.c')
-rw-r--r--net/ipv4/route.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 7520d577bd6a..953f0a4a7ff7 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -912,6 +912,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) {