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

Revert "socket: fix struct ifreq size in compat ioctl" 

This reverts commit 1cebf8f143 ("socket: fix struct ifreq
size in compat ioctl"), it's a bugfix for another commit that
I'll revert next.

This is not a 'perfect' revert, I'm keeping some coding style
intact rather than revert to the state with indentation errors.

Cc: stable@vger.kernel.org
Fixes: 1cebf8f143 ("socket: fix struct ifreq size in compat ioctl")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Johannes Berg 2019-01-25 22:43:17 +01:00 committed by David S. Miller
parent 6296789878
commit 63ff03ab78
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/socket.c
View File

@ -941,8 +941,7 @@ void dlci_ioctl_set(int (*hook) (unsigned int, void __user *))
EXPORT_SYMBOL(dlci_ioctl_set); EXPORT_SYMBOL(dlci_ioctl_set);
static long sock_do_ioctl(struct net *net, struct socket *sock, static long sock_do_ioctl(struct net *net, struct socket *sock,
unsigned int cmd, unsigned long arg, unsigned int cmd, unsigned long arg)
unsigned int ifreq_size)
{ {
int err; int err;
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
@ -968,11 +967,11 @@ static long sock_do_ioctl(struct net *net, struct socket *sock,
} else { } else {
struct ifreq ifr; struct ifreq ifr;
bool need_copyout; bool need_copyout;
if (copy_from_user(&ifr, argp, ifreq_size)) if (copy_from_user(&ifr, argp, sizeof(struct ifreq)))
return -EFAULT; return -EFAULT;
err = dev_ioctl(net, cmd, &ifr, &need_copyout); err = dev_ioctl(net, cmd, &ifr, &need_copyout);
if (!err && need_copyout) if (!err && need_copyout)
if (copy_to_user(argp, &ifr, ifreq_size)) if (copy_to_user(argp, &ifr, sizeof(struct ifreq)))
return -EFAULT; return -EFAULT;
} }
return err; return err;
@ -1071,8 +1070,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
err = open_related_ns(&net->ns, get_net_ns); err = open_related_ns(&net->ns, get_net_ns);
break; break;
default: default:
err = sock_do_ioctl(net, sock, cmd, arg, err = sock_do_ioctl(net, sock, cmd, arg);
sizeof(struct ifreq));
break; break;
} }
return err; return err;
@ -2780,8 +2778,7 @@ static int do_siocgstamp(struct net *net, struct socket *sock,
int err; int err;
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
err = sock_do_ioctl(net, sock, cmd, (unsigned long)&ktv, err = sock_do_ioctl(net, sock, cmd, (unsigned long)&ktv);
sizeof(struct compat_ifreq));
set_fs(old_fs); set_fs(old_fs);
if (!err) if (!err)
err = compat_put_timeval(&ktv, up); err = compat_put_timeval(&ktv, up);
@ -2797,8 +2794,7 @@ static int do_siocgstampns(struct net *net, struct socket *sock,
int err; int err;
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
err = sock_do_ioctl(net, sock, cmd, (unsigned long)&kts, err = sock_do_ioctl(net, sock, cmd, (unsigned long)&kts);
sizeof(struct compat_ifreq));
set_fs(old_fs); set_fs(old_fs);
if (!err) if (!err)
err = compat_put_timespec(&kts, up); err = compat_put_timespec(&kts, up);
@ -3109,8 +3105,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
} }
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
ret = sock_do_ioctl(net, sock, cmd, (unsigned long) r, ret = sock_do_ioctl(net, sock, cmd, (unsigned long) r);
sizeof(struct compat_ifreq));
set_fs(old_fs); set_fs(old_fs);
out: out:
@ -3223,8 +3218,7 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
case SIOCBONDSETHWADDR: case SIOCBONDSETHWADDR:
case SIOCBONDCHANGEACTIVE: case SIOCBONDCHANGEACTIVE:
case SIOCGIFNAME: case SIOCGIFNAME:
return sock_do_ioctl(net, sock, cmd, arg, return sock_do_ioctl(net, sock, cmd, arg);
sizeof(struct compat_ifreq));
} }
return -ENOIOCTLCMD; return -ENOIOCTLCMD;