From e6738861cadf5e52423cbef3b9c244d55d860700 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Tue, 20 Nov 2012 15:14:51 -0500
Subject: [PATCH] --- yaml --- r: 335853 b: refs/heads/master c:
 b4dd006760d671337b62532277b0296bcee8dfd4 h: refs/heads/master i:   335851:
 107fbdd0700fc4e1273a949194b7c1b3bb03168d v: v3

---
 [refs]                                 | 2 +-
 trunk/net/ipv6/inet6_connection_sock.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2afac0e2e548..eb24d4b5a324 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e2f61cd7a4e7642dcac4371734426e572f10370
+refs/heads/master: b4dd006760d671337b62532277b0296bcee8dfd4
diff --git a/trunk/net/ipv6/inet6_connection_sock.c b/trunk/net/ipv6/inet6_connection_sock.c
index c4f934176cab..30647857a375 100644
--- a/trunk/net/ipv6/inet6_connection_sock.c
+++ b/trunk/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);