diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-03-14 17:13:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-16 04:53:42 -0400 |
commit | 122bdf67f15a22bcabf6c2cab3a545d17ccf68dc (patch) | |
tree | 194cd16507ab67c34280c0c490268514bbe7f86a | |
parent | 762ad8a5330325b789cfb6dc896f81cf273ff4e9 (diff) |
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>
-rw-r--r-- | net/ipv6/route.c | 2 |
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, | |||
1077 | struct net *net = dev_net(dev); | 1077 | struct net *net = dev_net(dev); |
1078 | 1078 | ||
1079 | if (unlikely(!idev)) | 1079 | if (unlikely(!idev)) |
1080 | return NULL; | 1080 | return ERR_PTR(-ENODEV); |
1081 | 1081 | ||
1082 | rt = ip6_dst_alloc(&net->ipv6.ip6_dst_ops, dev, 0); | 1082 | rt = ip6_dst_alloc(&net->ipv6.ip6_dst_ops, dev, 0); |
1083 | if (unlikely(!rt)) { | 1083 | if (unlikely(!rt)) { |