summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2012-03-14 21:13:11 +0000
committerDavid S. Miller <davem@davemloft.net>2012-03-16 01:53:42 -0700
commit122bdf67f15a22bcabf6c2cab3a545d17ccf68dc (patch)
tree194cd16507ab67c34280c0c490268514bbe7f86a /net
parent762ad8a5330325b789cfb6dc896f81cf273ff4e9 (diff)
downloadlinux-122bdf67f15a22bcabf6c2cab3a545d17ccf68dc.tar.gz
linux-122bdf67f15a22bcabf6c2cab3a545d17ccf68dc.tar.bz2
linux-122bdf67f15a22bcabf6c2cab3a545d17ccf68dc.zip
ipv6: fix icmp6_dst_alloc()
commit 87a115783 ( ipv6: Move xfrm_lookup() call down into icmp6_dst_alloc().) forgot to convert one error path, leading to crashes in mld_sendpack() Many thanks to Dave Jones for providing a very complete bug report. Reported-by: Dave Jones <davej@redhat.com> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/route.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 8c2e3ab58f2a..22b766407de1 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1077,7 +1077,7 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
struct net *net = dev_net(dev);
if (unlikely(!idev))
- return NULL;
+ return ERR_PTR(-ENODEV);
rt = ip6_dst_alloc(&net->ipv6.ip6_dst_ops, dev, 0);
if (unlikely(!rt)) {