p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kill dev_ifname32() 

same story...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2017-10-01 21:12:09 -04:00
parent f92d4fc953
commit 4cf808e7ac
1 changed files with 1 additions and 21 deletions

22
net/socket.c
View File

@ -2666,25 +2666,6 @@ static int do_siocgstampns(struct net *net, struct socket *sock,
return err; return err;
} }
static int dev_ifname32(struct net *net, struct compat_ifreq __user *uifr32)
{
struct ifreq __user *uifr;
int err;
uifr = compat_alloc_user_space(sizeof(struct ifreq));
if (copy_in_user(uifr, uifr32, sizeof(struct compat_ifreq)))
return -EFAULT;
err = dev_ioctl(net, SIOCGIFNAME, uifr);
if (err)
return err;
if (copy_in_user(uifr32, uifr, sizeof(struct compat_ifreq)))
return -EFAULT;
return 0;
}
static int compat_dev_ifconf(struct net *net, struct compat_ifconf __user *uifc32) static int compat_dev_ifconf(struct net *net, struct compat_ifconf __user *uifc32)
{ {
struct compat_ifconf ifc32; struct compat_ifconf ifc32;
@ -3034,8 +3015,6 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
case SIOCSIFBR: case SIOCSIFBR:
case SIOCGIFBR: case SIOCGIFBR:
return old_bridge_ioctl(argp); return old_bridge_ioctl(argp);
case SIOCGIFNAME:
return dev_ifname32(net, argp);
case SIOCGIFCONF: case SIOCGIFCONF:
return compat_dev_ifconf(net, argp); return compat_dev_ifconf(net, argp);
case SIOCETHTOOL: case SIOCETHTOOL:
@ -3112,6 +3091,7 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
case SIOCBONDRELEASE: case SIOCBONDRELEASE:
case SIOCBONDSETHWADDR: case SIOCBONDSETHWADDR:
case SIOCBONDCHANGEACTIVE: case SIOCBONDCHANGEACTIVE:
case SIOCGIFNAME:
return sock_do_ioctl(net, sock, cmd, arg); return sock_do_ioctl(net, sock, cmd, arg);
} }