redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

net/compat: Merge multiple implementations of ifreq::ifr_data conversion 

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
hifive-unleashed-5.1
Ben Hutchings 2013-11-18 17:04:13 +00:00
parent 417c3522b3
commit 590d4693fb
1 changed files with 6 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
net/socket.c
View File

@ -2964,11 +2964,8 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
struct compat_ifreq __user *ifr32) struct compat_ifreq __user *ifr32)
{ {
struct ifreq kifr; struct ifreq kifr;
struct ifreq __user *uifr;
mm_segment_t old_fs; mm_segment_t old_fs;
int err; int err;
u32 data;
void __user *datap;
switch (cmd) { switch (cmd) {
case SIOCBONDENSLAVE: case SIOCBONDENSLAVE:
@ -2985,26 +2982,13 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
set_fs(old_fs); set_fs(old_fs);
return err; return err;
case SIOCBONDSLAVEINFOQUERY:
case SIOCBONDINFOQUERY:
uifr = compat_alloc_user_space(sizeof(*uifr));
if (copy_in_user(&uifr->ifr_name, &ifr32->ifr_name, IFNAMSIZ))
return -EFAULT;
if (get_user(data, &ifr32->ifr_ifru.ifru_data))
return -EFAULT;
datap = compat_ptr(data);
if (put_user(datap, &uifr->ifr_ifru.ifru_data))
return -EFAULT;
return dev_ioctl(net, cmd, uifr);
default: default:
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
} }
} }
static int siocdevprivate_ioctl(struct net *net, unsigned int cmd, /* Handle ioctls that use ifreq::ifr_data and just need struct ifreq converted */
static int compat_ifr_data_ioctl(struct net *net, unsigned int cmd,
struct compat_ifreq __user *u_ifreq32) struct compat_ifreq __user *u_ifreq32)
{ {
struct ifreq __user *u_ifreq64; struct ifreq __user *u_ifreq64;
@ -3104,27 +3088,6 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
return err; return err;
} }
static int compat_siocshwtstamp(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_data))
return -EFAULT;
uptr = compat_ptr(uptr32);
if (put_user(uptr, &uifr->ifr_data))
return -EFAULT;
return dev_ioctl(net, SIOCSHWTSTAMP, uifr);
}
struct rtentry32 { struct rtentry32 {
u32 rt_pad1; u32 rt_pad1;
struct sockaddr rt_dst; /* target address */ struct sockaddr rt_dst; /* target address */
@ -3236,7 +3199,7 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
struct net *net = sock_net(sk); struct net *net = sock_net(sk);
if (cmd >= SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE + 15)) if (cmd >= SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE + 15))
return siocdevprivate_ioctl(net, cmd, argp); return compat_ifr_data_ioctl(net, cmd, argp);
switch (cmd) { switch (cmd) {
case SIOCSIFBR: case SIOCSIFBR:
@ -3256,8 +3219,6 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
case SIOCBONDENSLAVE: case SIOCBONDENSLAVE:
case SIOCBONDRELEASE: case SIOCBONDRELEASE:
case SIOCBONDSETHWADDR: case SIOCBONDSETHWADDR:
case SIOCBONDSLAVEINFOQUERY:
case SIOCBONDINFOQUERY:
case SIOCBONDCHANGEACTIVE: case SIOCBONDCHANGEACTIVE:
return bond_ioctl(net, cmd, argp); return bond_ioctl(net, cmd, argp);
case SIOCADDRT: case SIOCADDRT:
@ -3267,8 +3228,10 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
return do_siocgstamp(net, sock, cmd, argp); return do_siocgstamp(net, sock, cmd, argp);
case SIOCGSTAMPNS: case SIOCGSTAMPNS:
return do_siocgstampns(net, sock, cmd, argp); return do_siocgstampns(net, sock, cmd, argp);
case SIOCBONDSLAVEINFOQUERY:
case SIOCBONDINFOQUERY:
case SIOCSHWTSTAMP: case SIOCSHWTSTAMP:
return compat_siocshwtstamp(net, argp); return compat_ifr_data_ioctl(net, cmd, argp);
case FIOSETOWN: case FIOSETOWN:
case SIOCSPGRP: case SIOCSPGRP: