Commit 05335c22 authored May 28, 2008 by Yang Hongyang Committed by YOSHIFUJI Hideaki Jun 05, 2008

[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>

parent 4bed72e4

net/ipv6/ipv6_sockglue.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message