From 1c219ddfeefcf5ab3667da354a130aa84329808e Mon Sep 17 00:00:00 2001
From: Yang Hongyang <yanghy@cn.fujitsu.com>
Date: Wed, 28 May 2008 16:23:47 +0800
Subject: [PATCH] --- yaml --- r: 97663 b: refs/heads/master c:
 05335c2220c4911b69cb1bdd79e603ab08088372 h: refs/heads/master i:   97661:
 fd642b94fd1b9cd08f6829926b03e7208a17f8ae   97659:
 1c804ba982b97af18f801509541af09c20ad65a4   97655:
 fd971635723848bd4b649ba5076ef94e3a15ea94   97647:
 7580a800949fcbd1f4622dbfa450ee2ae4dc1165   97631:
 d455177f15b2757e40d4dbb8cb75a508dda89da0   97599:
 51947494a9aa49b0bee0a46ece2879059adfb53c   97535:
 bf8f3dd9aea71b5944155e620f78192eafb4e5fe v: v3

---
 [refs]                         | 2 +-
 trunk/net/ipv6/ipv6_sockglue.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 30d44f099ec3..29c03670f9a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bed72e4f5502ea3322f0a00794815fa58951abe
+refs/heads/master: 05335c2220c4911b69cb1bdd79e603ab08088372
diff --git a/trunk/net/ipv6/ipv6_sockglue.c b/trunk/net/ipv6/ipv6_sockglue.c
index 56d55fecf8ec..aa7bedf780e5 100644
--- a/trunk/net/ipv6/ipv6_sockglue.c
+++ b/trunk/net/ipv6/ipv6_sockglue.c
@@ -975,6 +975,9 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
 		len = ipv6_getsockopt_sticky(sk, np->opt,
 					     optname, optval, len);
 		release_sock(sk);
+		/* check if ipv6_getsockopt_sticky() returns err code */
+		if (len < 0)
+			return len;
 		return put_user(len, optlen);
 	}