summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2012-11-20 15:14:51 -0500
committerDavid S. Miller <davem@davemloft.net>2012-11-20 15:16:15 -0500
commitb4dd006760d671337b62532277b0296bcee8dfd4 (patch)
tree77eb7ab6620cc6fa7876cbf0c051e2a551503f15 /net
parent3e2f61cd7a4e7642dcac4371734426e572f10370 (diff)
downloadop-kernel-dev-b4dd006760d671337b62532277b0296bcee8dfd4.zip
op-kernel-dev-b4dd006760d671337b62532277b0296bcee8dfd4.tar.gz
ipv6: fix inet6_csk_update_pmtu() return value
In case of error, inet6_csk_update_pmtu() should consistently return NULL. Bug added in commit 35ad9b9cf7d8a (ipv6: Add helper inet6_csk_update_pmtu().) Reported-by: LluĂ­s Batlle i Rossell <viric@viric.name> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/inet6_connection_sock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
index c4f9341..3064785 100644
--- a/net/ipv6/inet6_connection_sock.c
+++ b/net/ipv6/inet6_connection_sock.c
@@ -252,6 +252,7 @@ struct dst_entry *inet6_csk_update_pmtu(struct sock *sk, u32 mtu)
return NULL;
dst->ops->update_pmtu(dst, sk, NULL, mtu);
- return inet6_csk_route_socket(sk, &fl6);
+ dst = inet6_csk_route_socket(sk, &fl6);
+ return IS_ERR(dst) ? NULL : dst;
}
EXPORT_SYMBOL_GPL(inet6_csk_update_pmtu);
OpenPOWER on IntegriCloud