Commit 80991790 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

ipv6: Compilation fix for compat MCAST_MSFILTER sockopts. 



The last hunk from the commit dae50295 (ipv4/ipv6 compat: Fix SSM
applications on 64bit kernels.) escaped from the compat_ipv6_setsockopt
to the ipv6_getsockopt (I guess due to patch smartness wrt searching
for context) thus breaking 32-bit and 64-bit-without-compat compilation.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Acked-by: default avatarDavid L Stevens <dlstevens@us.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 15913114

net/ipv6/ipv6_sockglue.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1089,10 +1089,6 @@ int ipv6_getsockopt(struct sock *sk, int level, int optname, 
	if(level != SOL_IPV6)

	if(level != SOL_IPV6)

		return -ENOPROTOOPT;

		return -ENOPROTOOPT;





	if (optname == MCAST_MSFILTER)

		return compat_mc_getsockopt(sk, level, optname, optval, optlen,

			ipv6_getsockopt);



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

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

#ifdef CONFIG_NETFILTER

#ifdef CONFIG_NETFILTER

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

	/* we need to exclude all possible ENOPROTOOPTs except default case */
@@ -1131,6 +1127,10 @@ int compat_ipv6_getsockopt(struct sock *sk, int level, int optname, 
	if (level != SOL_IPV6)

	if (level != SOL_IPV6)

		return -ENOPROTOOPT;

		return -ENOPROTOOPT;





	if (optname == MCAST_MSFILTER)

		return compat_mc_getsockopt(sk, level, optname, optval, optlen,

			ipv6_getsockopt);



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

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

#ifdef CONFIG_NETFILTER

#ifdef CONFIG_NETFILTER

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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE