Commit 931ca7ab authored by Al Viro's avatar Al Viro
Browse files

ip*_mc_gsfget(): lift copyout of struct group_filter into callers 



pass the userland pointer to the array in its tail, so that part
gets copied out by our functions; copyout of everything else is
done in the callers.  Rationale: reuse for compat; the array
is the same in native and compat, the layout of parts before it
is different for compat.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e9c375fb

include/linux/igmp.h

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ extern int ip_mc_msfilter(struct sock *sk, struct ip_msfilter *msf,int ifindex); 
extern int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf,

		struct ip_msfilter __user *optval, int __user *optlen);

extern int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,

		struct group_filter __user *optval, int __user *optlen);

			struct sockaddr_storage __user *p);

extern int ip_mc_sf_allow(struct sock *sk, __be32 local, __be32 rmt,

			  int dif, int sdif);

extern void ip_mc_init_dev(struct in_device *);

include/net/ipv6.h

+1 −1
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ int ip6_mc_source(int add, int omode, struct sock *sk, 
		  struct group_source_req *pgsr);

int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf);

int ip6_mc_msfget(struct sock *sk, struct group_filter *gsf,

		  struct group_filter __user *optval, int __user *optlen);

		  struct sockaddr_storage __user *p);



#ifdef CONFIG_PROC_FS

int ac6_proc_init(struct net *net);

net/ipv4/igmp.c

+5 −13
Original line number Diff line number Diff line
@@ -2565,9 +2565,9 @@ int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf, 
}



int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,

	struct group_filter __user *optval, int __user *optlen)

	struct sockaddr_storage __user *p)

{

	int err, i, count, copycount;

	int i, count, copycount;

	struct sockaddr_in *psin;

	__be32 addr;

	struct ip_mc_socklist *pmc;
@@ -2583,37 +2583,29 @@ int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf, 
	if (!ipv4_is_multicast(addr))

		return -EINVAL;



	err = -EADDRNOTAVAIL;



	for_each_pmc_rtnl(inet, pmc) {

		if (pmc->multi.imr_multiaddr.s_addr == addr &&

		    pmc->multi.imr_ifindex == gsf->gf_interface)

			break;

	}

	if (!pmc)		/* must have a prior join */

		goto done;

		return -EADDRNOTAVAIL;

	gsf->gf_fmode = pmc->sfmode;

	psl = rtnl_dereference(pmc->sflist);

	count = psl ? psl->sl_count : 0;

	copycount = count < gsf->gf_numsrc ? count : gsf->gf_numsrc;

	gsf->gf_numsrc = count;

	if (put_user(GROUP_FILTER_SIZE(copycount), optlen) ||

	    copy_to_user(optval, gsf, GROUP_FILTER_SIZE(0))) {

		return -EFAULT;

	}

	for (i = 0; i < copycount; i++) {

	for (i = 0; i < copycount; i++, p++) {

		struct sockaddr_storage ss;



		psin = (struct sockaddr_in *)&ss;

		memset(&ss, 0, sizeof(ss));

		psin->sin_family = AF_INET;

		psin->sin_addr.s_addr = psl->sl_addr[i];

		if (copy_to_user(&optval->gf_slist[i], &ss, sizeof(ss)))

		if (copy_to_user(p, &ss, sizeof(ss)))

			return -EFAULT;

	}

	return 0;

done:

	return err;

}



/*

net/ipv4/ip_sockglue.c

+14 −5
Original line number Diff line number Diff line
@@ -1473,19 +1473,28 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname, 
	}

	case MCAST_MSFILTER:

	{

		struct group_filter __user *p = (void __user *)optval;

		struct group_filter gsf;

		const int size0 = offsetof(struct group_filter, gf_slist);

		int num;



		if (len < GROUP_FILTER_SIZE(0)) {

		if (len < size0) {

			err = -EINVAL;

			goto out;

		}

		if (copy_from_user(&gsf, optval, GROUP_FILTER_SIZE(0))) {

		if (copy_from_user(&gsf, p, size0)) {

			err = -EFAULT;

			goto out;

		}

		err = ip_mc_gsfget(sk, &gsf,

				   (struct group_filter __user *)optval,

				   optlen);

		num = gsf.gf_numsrc;

		err = ip_mc_gsfget(sk, &gsf, p->gf_slist);

		if (err)

			goto out;

		if (gsf.gf_numsrc < num)

			num = gsf.gf_numsrc;

		if (put_user(GROUP_FILTER_SIZE(num), optlen) ||

		    copy_to_user(p, &gsf, size0))

			err = -EFAULT;

		goto out;

	}

	case IP_MULTICAST_ALL:

net/ipv6/ipv6_sockglue.c

+14 −4
Original line number Diff line number Diff line
@@ -1056,18 +1056,28 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname, 
		break;

	case MCAST_MSFILTER:

	{

		struct group_filter __user *p = (void __user *)optval;

		struct group_filter gsf;

		const int size0 = offsetof(struct group_filter, gf_slist);

		int num;

		int err;



		if (len < GROUP_FILTER_SIZE(0))

		if (len < size0)

			return -EINVAL;

		if (copy_from_user(&gsf, optval, GROUP_FILTER_SIZE(0)))

		if (copy_from_user(&gsf, p, size0))

			return -EFAULT;

		if (gsf.gf_group.ss_family != AF_INET6)

			return -EADDRNOTAVAIL;

		num = gsf.gf_numsrc;

		lock_sock(sk);

		err = ip6_mc_msfget(sk, &gsf,

			(struct group_filter __user *)optval, optlen);

		err = ip6_mc_msfget(sk, &gsf, p->gf_slist);

		if (!err) {

			if (num > gsf.gf_numsrc)

				num = gsf.gf_numsrc;

			if (put_user(GROUP_FILTER_SIZE(num), optlen) ||

			    copy_to_user(p, &gsf, size0))

				err = -EFAULT;

		}

		release_sock(sk);

		return err;

	}