Commit dae50295 authored by David L Stevens's avatar David L Stevens Committed by David S. Miller
Browse files

ipv4/ipv6 compat: Fix SSM applications on 64bit kernels. 



Add support on 64-bit kernels for seting 32-bit compatible MCAST*
socket options.

Signed-off-by: default avatarDavid L Stevens <dlstevens@us.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 01a2202c

include/net/compat.h

+3 −0
Original line number Diff line number Diff line
@@ -40,4 +40,7 @@ extern int put_cmsg_compat(struct msghdr*, int, int, int, void *); 


extern int cmsghdr_from_user_compat_to_kern(struct msghdr *, struct sock *, unsigned char *, int);



extern int compat_mc_setsockopt(struct sock *, int, int, char __user *, int,

	int (*)(struct sock *, int, int, char __user *, int));



#endif /* NET_COMPAT_H */

net/compat.c

+117 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 


#include <net/scm.h>

#include <net/sock.h>

#include <net/ip.h>

#include <net/ipv6.h>

#include <asm/uaccess.h>

#include <net/compat.h>
@@ -521,6 +523,121 @@ asmlinkage long compat_sys_getsockopt(int fd, int level, int optname, 
	}

	return err;

}



struct compat_group_req {

	__u32				 gr_interface;

	struct __kernel_sockaddr_storage gr_group

		__attribute__ ((aligned(4)));

} __attribute__ ((packed));



struct compat_group_source_req {

	__u32				 gsr_interface;

	struct __kernel_sockaddr_storage gsr_group

		__attribute__ ((aligned(4)));

	struct __kernel_sockaddr_storage gsr_source

		__attribute__ ((aligned(4)));

} __attribute__ ((packed));



struct compat_group_filter {

	__u32				 gf_interface;

	struct __kernel_sockaddr_storage gf_group

		__attribute__ ((aligned(4)));

	__u32				 gf_fmode;

	__u32				 gf_numsrc;

	struct __kernel_sockaddr_storage gf_slist[1]

		__attribute__ ((aligned(4)));

} __attribute__ ((packed));





int compat_mc_setsockopt(struct sock *sock, int level, int optname,

	char __user *optval, int optlen,

	int (*setsockopt)(struct sock *,int,int,char __user *,int))

{

	char __user	*koptval = optval;

	int		koptlen = optlen;



	switch (optname) {

	case MCAST_JOIN_GROUP:

	case MCAST_LEAVE_GROUP:

	{

		struct compat_group_req __user *gr32 = (void *)optval;

		struct group_req __user *kgr =

			compat_alloc_user_space(sizeof(struct group_req));

		u32 interface;



		if (!access_ok(VERIFY_READ, gr32, sizeof(*gr32)) ||

		    !access_ok(VERIFY_WRITE, kgr, sizeof(struct group_req)) ||

		    __get_user(interface, &gr32->gr_interface) ||

		    __put_user(interface, &kgr->gr_interface) ||

		    copy_in_user(&kgr->gr_group, &gr32->gr_group,

				sizeof(kgr->gr_group)))

			return -EFAULT;

		koptval = (char __user *)kgr;

		koptlen = sizeof(struct group_req);

		break;

	}

	case MCAST_JOIN_SOURCE_GROUP:

	case MCAST_LEAVE_SOURCE_GROUP:

	case MCAST_BLOCK_SOURCE:

	case MCAST_UNBLOCK_SOURCE:

	{

		struct compat_group_source_req __user *gsr32 = (void *)optval;

		struct group_source_req *kgsr = compat_alloc_user_space(

			sizeof(struct group_source_req));

		u32 interface;



		if (!access_ok(VERIFY_READ, gsr32, sizeof(*gsr32)) ||

		    !access_ok(VERIFY_WRITE, kgsr,

			sizeof(struct group_source_req)) ||

		    __get_user(interface, &gsr32->gsr_interface) ||

		    __put_user(interface, &kgsr->gsr_interface) ||

		    copy_in_user(&kgsr->gsr_group, &gsr32->gsr_group,

				sizeof(kgsr->gsr_group)) ||

		    copy_in_user(&kgsr->gsr_source, &gsr32->gsr_source,

				sizeof(kgsr->gsr_source)))

			return -EFAULT;

		koptval = (char __user *)kgsr;

		koptlen = sizeof(struct group_source_req);

		break;

	}

	case MCAST_MSFILTER:

	{

		struct compat_group_filter __user *gf32 = (void *)optval;

		struct group_filter *kgf;

		u32 interface, fmode, numsrc;



		if (!access_ok(VERIFY_READ, gf32, sizeof(*gf32)) ||

		    __get_user(interface, &gf32->gf_interface) ||

		    __get_user(fmode, &gf32->gf_fmode) ||

		    __get_user(numsrc, &gf32->gf_numsrc))

			return -EFAULT;

		koptlen = optlen + sizeof(struct group_filter) -

				sizeof(struct compat_group_filter);

		if (koptlen < GROUP_FILTER_SIZE(numsrc))

			return -EINVAL;

		kgf = compat_alloc_user_space(koptlen);

		if (!access_ok(VERIFY_WRITE, kgf, koptlen) ||

		    __put_user(interface, &kgf->gf_interface) ||

		    __put_user(fmode, &kgf->gf_fmode) ||

		    __put_user(numsrc, &kgf->gf_numsrc) ||

		    copy_in_user(&kgf->gf_group, &gf32->gf_group,

				sizeof(kgf->gf_group)) ||

		    (numsrc && copy_in_user(&kgf->gf_slist, &gf32->gf_slist,

				numsrc * sizeof(kgf->gf_slist[0]))))

			return -EFAULT;

		koptval = (char __user *)kgf;

		break;

	}



	default:

		break;

	}

	return setsockopt(sock, level, optname, koptval, koptlen);

}



EXPORT_SYMBOL(compat_mc_setsockopt);





/* Argument list sizes for compat_sys_socketcall */

#define AL(x) ((x) * sizeof(u32))

static unsigned char nas[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3),

net/ipv4/ip_sockglue.c

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/mroute.h>

#include <net/route.h>

#include <net/xfrm.h>

#include <net/compat.h>

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#include <net/transp_v6.h>

#endif
@@ -923,6 +924,10 @@ int compat_ip_setsockopt(struct sock *sk, int level, int optname, 
	if (level != SOL_IP)

		return -ENOPROTOOPT;



	if (optname >= MCAST_JOIN_GROUP && optname <= MCAST_MSFILTER)

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

			ip_setsockopt);



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

#ifdef CONFIG_NETFILTER

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

net/ipv6/ipv6_sockglue.c

+5 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include <net/udp.h>

#include <net/udplite.h>

#include <net/xfrm.h>

#include <net/compat.h>



#include <asm/uaccess.h>
@@ -779,6 +780,10 @@ int compat_ipv6_setsockopt(struct sock *sk, int level, int optname, 
	if (level != SOL_IPV6)

		return -ENOPROTOOPT;



	if (optname >= MCAST_JOIN_GROUP && optname <= MCAST_MSFILTER)

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

			ipv6_setsockopt);



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

#ifdef CONFIG_NETFILTER

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