summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-10-09 02:27:08 +0100
committerAndy Green <andy.green@linaro.org>2011-10-09 02:27:08 +0100
commit56d8f7888f1230c444349494ad24926ada2f56e1 (patch)
tree022f8f99ad96a2230a0635d0fe229406e29943e1 /net
parent9876bba6ebe6ebce78bfec9d223196a52097a571 (diff)
net: ipv4: tcp: Fix crash in tcp_nuke_addr
ip_route_output_key can return an ERR_PTR, don't dereference it. Change-Id: I6b86a451b2bdb33873d79b3cf90c11dbe72bc081 Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index d1e438fa0e2..5eb7af23461 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3328,7 +3328,7 @@ static int tcp_is_local(struct net *net, __be32 addr) {
struct rtable *rt;
struct flowi4 fl4 = { .daddr = addr };
rt = ip_route_output_key(net, &fl4);
- if (!rt)
+ if (IS_ERR_OR_NULL(rt))
return 0;
return rt->dst.dev && (rt->dst.dev->flags & IFF_LOOPBACK);
}