UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnd Bergmann 2009-11-08 20:57:03 -08:00 committed by David S. Miller
parent fab2532ba5
commit 7a50a240c4
2 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
include/linux/compat.h
View File

@ -165,25 +165,32 @@ struct compat_ifmap {
unsigned char port; 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 { struct compat_ifreq {
union { union {
char ifrn_name[IFNAMSIZ]; /* if name, e.g. "en0" */ char ifrn_name[IFNAMSIZ]; /* if name, e.g. "en0" */
} ifr_ifrn; } ifr_ifrn;
union { union {
struct sockaddr ifru_addr; struct sockaddr ifru_addr;
struct sockaddr ifru_dstaddr; struct sockaddr ifru_dstaddr;
struct sockaddr ifru_broadaddr; struct sockaddr ifru_broadaddr;
struct sockaddr ifru_netmask; struct sockaddr ifru_netmask;
struct sockaddr ifru_hwaddr; struct sockaddr ifru_hwaddr;
short ifru_flags; short ifru_flags;
compat_int_t ifru_ivalue; compat_int_t ifru_ivalue;
compat_int_t ifru_mtu; compat_int_t ifru_mtu;
struct compat_ifmap ifru_map; struct compat_ifmap ifru_map;
char ifru_slave[IFNAMSIZ]; /* Just fits the size */ char ifru_slave[IFNAMSIZ]; /* Just fits the size */
char ifru_newname[IFNAMSIZ]; char ifru_newname[IFNAMSIZ];
compat_caddr_t ifru_data; compat_caddr_t ifru_data;
/* XXXX? ifru_settings should be here */ struct compat_if_settings ifru_settings;
} ifr_ifru; } ifr_ifru;
}; };
struct compat_ifconf { struct compat_ifconf {

23
net/socket.c
View File

@ -2627,6 +2627,27 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
return dev_ioctl(net, SIOCETHTOOL, ifr); 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, static int bond_ioctl(struct net *net, unsigned int cmd,
struct compat_ifreq __user *ifr32) 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); return dev_ifconf(net, argp);
case SIOCETHTOOL: case SIOCETHTOOL:
return ethtool_ioctl(net, argp); return ethtool_ioctl(net, argp);
case SIOCWANDEV:
return compat_siocwandev(net, argp);
case SIOCBONDENSLAVE: case SIOCBONDENSLAVE:
case SIOCBONDRELEASE: case SIOCBONDRELEASE:
case SIOCBONDSETHWADDR: case SIOCBONDSETHWADDR: