---

yaml --- r: 97663 b: refs/heads/master c: 05335c2 h: refs/heads/master i: 97661: fd642b9 97659: 1c804ba 97655: fd97163 97647: 7580a80 97631: d455177 97599: 5194749 97535: bf8f3dd v: v3
git-mirror · Jun 4, 2008 · 1c219dd · 1c219dd
1 parent 6e2d0e8
commit 1c219dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);
 	}