Commit cf6fc4a9 authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller
Browse files

[IPV6]: Fix the return value of ipv6_getsockopt 



If CONFIG_NETFILTER if not selected when compile the kernel source code, 
ipv6_getsockopt will returen an EINVAL error if optname is not supported by
the kernel. But if CONFIG_NETFILTER is selected, ENOPROTOOPT error will 
be return.

This patch fix to always return ENOPROTOOPT error if optname argument of 
ipv6_getsockopt is not supported by the kernel.

Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ae41254

net/ipv6/ipv6_sockglue.c

+5 −7
Original line number Diff line number Diff line
@@ -1046,7 +1046,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname, 
		break;



	default:

		return -EINVAL;

		return -ENOPROTOOPT;

	}

	len = min_t(unsigned int, sizeof(int), len);

	if(put_user(len, optlen))
@@ -1069,9 +1069,8 @@ int ipv6_getsockopt(struct sock *sk, int level, int optname, 


	err = do_ipv6_getsockopt(sk, level, optname, optval, optlen);

#ifdef CONFIG_NETFILTER

	/* we need to exclude all possible EINVALs except default case */

	if (err == -EINVAL && optname != IPV6_ADDRFORM &&

			optname != MCAST_MSFILTER) {

	/* we need to exclude all possible ENOPROTOOPTs except default case */

	if (err == -ENOPROTOOPT && optname != IPV6_2292PKTOPTIONS) {

		int len;



		if (get_user(len, optlen))
@@ -1108,9 +1107,8 @@ int compat_ipv6_getsockopt(struct sock *sk, int level, int optname, 


	err = do_ipv6_getsockopt(sk, level, optname, optval, optlen);

#ifdef CONFIG_NETFILTER

	/* we need to exclude all possible EINVALs except default case */

	if (err == -EINVAL && optname != IPV6_ADDRFORM &&

			optname != MCAST_MSFILTER) {

	/* we need to exclude all possible ENOPROTOOPTs except default case */

	if (err == -ENOPROTOOPT && optname != IPV6_2292PKTOPTIONS) {

		int len;



		if (get_user(len, optlen))

CRA Git | Maintained and supported by SUSTech CRA and CCSE