Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a50a240 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

net/compat_ioctl: support SIOCWANDEV 



This adds compat_ioctl support for SIOCWANDEV, which has
always been missing.

The definition of struct compat_ifreq was missing an
ifru_settings fields that is needed to support SIOCWANDEV,
so add that and clean up the whitespace damage in the
struct definition.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fab2532b

include/linux/compat.h

+24 −17
Original line number Diff line number Diff line
@@ -165,6 +165,13 @@ struct compat_ifmap { 
	unsigned char port;

};



struct compat_if_settings

{

	unsigned int type;	/* Type of physical device or protocol */

	unsigned int size;	/* Size of the data allocated by the caller */

	compat_uptr_t ifs_ifsu;	/* union of pointers */

};



struct compat_ifreq {

	union {

		char	ifrn_name[IFNAMSIZ];    /* if name, e.g. "en0" */
@@ -182,7 +189,7 @@ struct compat_ifreq { 
		char	ifru_slave[IFNAMSIZ];   /* Just fits the size */

		char	ifru_newname[IFNAMSIZ];

		compat_caddr_t	ifru_data;

	    /* XXXX? ifru_settings should be here */

		struct	compat_if_settings ifru_settings;

	} ifr_ifru;

};

net/socket.c

+23 −0
Original line number Diff line number Diff line
@@ -2627,6 +2627,27 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32) 
	return dev_ioctl(net, SIOCETHTOOL, ifr);

}



static int compat_siocwandev(struct net *net, struct compat_ifreq __user *uifr32)

{

	void __user *uptr;

	compat_uptr_t uptr32;

	struct ifreq __user *uifr;



	uifr = compat_alloc_user_space(sizeof (*uifr));

	if (copy_in_user(uifr, uifr32, sizeof(struct compat_ifreq)))

		return -EFAULT;



	if (get_user(uptr32, &uifr32->ifr_settings.ifs_ifsu))

		return -EFAULT;



	uptr = compat_ptr(uptr32);



	if (put_user(uptr, &uifr->ifr_settings.ifs_ifsu.raw_hdlc))

		return -EFAULT;



	return dev_ioctl(net, SIOCWANDEV, uifr);

}



static int bond_ioctl(struct net *net, unsigned int cmd,

			 struct compat_ifreq __user *ifr32)

{
@@ -3058,6 +3079,8 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock, 
		return dev_ifconf(net, argp);

	case SIOCETHTOOL:

		return ethtool_ioctl(net, argp);

	case SIOCWANDEV:

		return compat_siocwandev(net, argp);

	case SIOCBONDENSLAVE:

	case SIOCBONDRELEASE:

	case SIOCBONDSETHWADDR: