aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorYang Hongyang <yanghy@cn.fujitsu.com>2008-05-28 04:23:47 -0400
committerYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-06-04 15:02:34 -0400
commit05335c2220c4911b69cb1bdd79e603ab08088372 (patch)
treefadca5b01e5029eaef277f691c9f4d78a54c0bad /net/ipv6
parent4bed72e4f5502ea3322f0a00794815fa58951abe (diff)
[IPV6]: Fix the return value of get destination options with NULL data pointer
If we pass NULL data buffer to getsockopt(), it will return 0, and the option length is set to -EFAULT: getsockopt(sk, IPPROTO_IPV6, IPV6_DSTOPTS, NULL, &len); This is because ipv6_getsockopt_sticky() will return -EFAULT or -EINVAL if some error occur. This patch fix this problem. Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com> Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/ipv6_sockglue.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 56d55fecf8ec..aa7bedf780e5 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -975,6 +975,9 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
975 len = ipv6_getsockopt_sticky(sk, np->opt, 975 len = ipv6_getsockopt_sticky(sk, np->opt,
976 optname, optval, len); 976 optname, optval, len);
977 release_sock(sk); 977 release_sock(sk);
978 /* check if ipv6_getsockopt_sticky() returns err code */
979 if (len < 0)
980 return len;
978 return put_user(len, optlen); 981 return put_user(len, optlen);
979 } 982 }
980 983