diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-11-20 15:14:51 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-20 15:16:15 -0500 |
| commit | b4dd006760d671337b62532277b0296bcee8dfd4 (patch) | |
| tree | 77eb7ab6620cc6fa7876cbf0c051e2a551503f15 /net/ipv6 | |
| parent | 3e2f61cd7a4e7642dcac4371734426e572f10370 (diff) | |
| download | linux-3.10-b4dd006760d671337b62532277b0296bcee8dfd4.tar.gz linux-3.10-b4dd006760d671337b62532277b0296bcee8dfd4.tar.bz2 linux-3.10-b4dd006760d671337b62532277b0296bcee8dfd4.zip | |
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/ipv6')
| -rw-r--r-- | net/ipv6/inet6_connection_sock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c index c4f934176ca..30647857a37 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); |