[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <OF3F5D943F.5B85126C-ON8825743B.004ED1BA-8825743B.004F51C2@us.ibm.com>
Date: Wed, 30 Apr 2008 07:26:29 -0700
From: David Stevens <dlstevens@...ibm.com>
To: Pavel Emelyanov <xemul@...nvz.org>
Cc: David Miller <davem@...emloft.net>,
Linux Netdev List <netdev@...r.kernel.org>
Subject: Re: [PATCH][IPV6]: Compilation fix for compat MCAST_MSFILTER sockopts.
Pavel,
Definitely should be in compat_ipv6_getsockopt() as the original was-- I
hope
your patch doesn't do the same thing when applied!
Good catch!
+-DLS
Acked-by: David L Stevens <dlstevens@...ibm.com>
netdev-owner@...r.kernel.org wrote on 04/30/2008 06:36:31 AM:
> 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: Pavel Emelyanov <xemul@...nvz.org>
>
> ---
>
> diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
> index b4a26f2..56d55fe 100644
> --- a/net/ipv6/ipv6_sockglue.c
> +++ b/net/ipv6/ipv6_sockglue.c
> @@ -1089,10 +1089,6 @@ int ipv6_getsockopt(struct sock *sk, int level,
int optname,
> if(level != SOL_IPV6)
> 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);
> #ifdef CONFIG_NETFILTER
> /* 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)
> 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);
> #ifdef CONFIG_NETFILTER
> /* we need to exclude all possible ENOPROTOOPTs except default case
*/
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists