net, compat_ioctl: move handlers to net/socket.c
Subsystems (6)
cover net, compat_ioctl: move handlers to net/socket.c
This cleans up some of the socket ioctl handling by moving it from fs/compat_ioctl.c to net/socket.c. The code is still untested, so this is an RFC for now. If you're happy with it, I'll do some testing to see if everything still works.
This series is a prerequisite for cleaning up the rest of compat_ioctl.c, saving some 30kb of kernel memory in the end.
The first four patches are probably worthwhile independently, because they fix some bugs in compat_ioctl handling. There is some obvious conflict with the ATM patch I sent independently today. That one should probably be worked out first.
Arnd <><
---
Arnd Bergmann (7):
compat: add struct compat_ifreq etc to compat.h net/tun: handle compat_ioctl directly
net, compat_ioctl: handle socket ioctl abuses in tty drivers appletalk:Â handle SIOCATALKDIFADDR compat ioctl copy socket ioctl code to net/socket.h
compat: move sockios handling to net/socket.c
net, compat_ioctl: handle more ioctls correctly
drivers/net/hamradio/6pack.c | 16 + drivers/net/hamradio/mkiss.c | 16 + drivers/net/slip.c | 21 ++ drivers/net/tun.c | 55 +++- drivers/net/wan/x25_asy.c | 15 + drivers/net/wireless/strip.c | 12 + fs/compat_ioctl.c | 745 ----------------------------------------- include/linux/compat.h | 39 +++ net/appletalk/ddp.c | 12 +- net/socket.c | 748 +++++++++++++++++++++++++++++++++++++++++- 10 files changed, 914 insertions(+), 765 deletions(-)
PATCH 1/7 compat: add struct compat_ifreq etc to compat.h
In order to move socket ioctl conversion code into multiple places in the socket code, we need a common defintion of the data structures it uses.
Also change the name from ifreq32 to compat_ifreq to follow the naming convention for compat.h
--- include/linux/compat.h | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-)
include/linux/compat.h +39 -0
@@ -10,6 +10,8 @@#include <linux/stat.h> #include <linux/param.h> /* for HZ */ #include <linux/sem.h> +#include <linux/socket.h> +#include <linux/if.h> #include <asm/compat.h> #include <asm/siginfo.h>
@@ -154,6 +156,43 @@ typedef struct compat_sigevent { } _sigev_un; } compat_sigevent_t; +struct compat_ifmap { +compat_ulong_t mem_start; +compat_ulong_t mem_end; +unsigned short base_addr; +unsigned char irq; +unsigned char dma; +unsigned char port; +}; + +struct compat_ifreq { +#define IFHWADDRLEN 6 +#define IFNAMSIZ 16 +union { +char ifrn_name[IFNAMSIZ ];/* if name, e.g. "en0" */ + } ifr_ifrn; +union { +struct sockaddr ifru_addr; +struct sockaddr ifru_dstaddr; +struct sockaddr ifru_broadaddr; +struct sockaddr ifru_netmask; +struct sockaddr ifru_hwaddr; +short ifru_flags; +compat_int_t ifru_ivalue; +compat_int_t ifru_mtu; +struct compat_ifmap ifru_map; +char ifru_slave[IFNAMSIZ ];/* Just fits the size */ +char ifru_newname[IFNAMSIZ ]; +compat_caddr_t ifru_data; +/* XXXX? ifru_settings should be here */ + } ifr_ifru; +}; + +struct compat_ifconf { +compat_int_t ifc_len;/* size of buffer */ +compat_caddr_t ifcbuf; +}; +struct compat_robust_list {compat_uptr_t next; };
Signature · 1 line
1.6.3.3
Re: [PATCH 1/7] compat: add struct compat_ifreq etc to compat.h
Quoted 19 lines · Arnd Bergmann
include/linux/compat.h +5
-0+struct compat_ifreq { +#define IFHWADDRLEN 6 +#define IFNAMSIZ 16 +union { +char ifrn_name[IFNAMSIZ ];/* if name, e.g. "en0" */
include/linux/compat.h +12
-0+ } ifr_ifrn; +union { +struct sockaddr ifru_addr; +struct sockaddr ifru_dstaddr; +struct sockaddr ifru_broadaddr; +struct sockaddr ifru_netmask; +struct sockaddr ifru_hwaddr; +short ifru_flags; +compat_int_t ifru_ivalue; +compat_int_t ifru_mtu; +struct compat_ifmap ifru_map; +char ifru_slave[IFNAMSIZ ];/* Just fits the size */
include/linux/compat.h typedef struct compat_sigevent { · line 190
Quoted 6 lines
include/linux/compat.h +6
-0+char ifru_newname[IFNAMSIZ ]; +compat_caddr_t ifru_data; +/* XXXX? ifru_settings should be here */ + } ifr_ifru; +}; +
Did you just copy this from someplace else? Many of the lines seems to be tab damaged.
Daniel
PATCH 2/7 net/tun: handle compat_ioctl directly
In reply to Arnd BergmannThe tun driver is the only code in the kernel that operates on a character device with struct ifreq. Change the driver to handle the conversion itself so we can contain the remaining ifreq handling in the socket layer.
This also fixes a bug in the handling of invalid ioctl numbers on an unbound tun device. The driver treats this as a TUNSETIFF in native mode, but there is no way for the generic compat_ioctl() function to emulate this behaviour. Possibly the driver was only doing this accidentally anyway, but if any code relies on this misfeature, it now also works in compat mode.
--- drivers/net/tun.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++------ fs/compat_ioctl.c | 20 ------------------- 2 files changed, 48 insertions(+), 27 deletions(-)
drivers/net/tun.c +48 -7
@@ -54,6 +54,7 @@#include <linux/miscdevice.h> #include <linux/ethtool.h> #include <linux/rtnetlink.h> +#include <linux/compat.h> #include <linux/if.h> #include <linux/if_arp.h> #include <linux/if_ether.h>
@@ -1110,8 +1111,8 @@ static int set_offload(struct net_device *dev, unsigned long arg)return 0 ; } -static long tun_chr_ioctl (struct file *file,unsigned int cmd, -unsigned long arg) +static long __tun_chr_ioctl (struct file *file,unsigned int cmd, +unsigned long arg,int ifreq_len) {struct tun_file *tfile = file->private_data;struct tun_struct *tun;
@@ -1121,7 +1122,7 @@ static long tun_chr_ioctl(struct file *file, unsigned int cmd,int ret;if (cmd ==TUNSETIFF ||_IOC_TYPE (cmd) ==0x89 ) -if (copy_from_user (&ifr, argp,sizeof ifr)) +if (copy_from_user (&ifr, argp, ifreq_len))return -EFAULT ;if (cmd ==TUNGETFEATURES ) {
@@ -1144,7 +1145,7 @@ static long tun_chr_ioctl(struct file *file, unsigned int cmd,if (ret) goto unlock; -if (copy_to_user (argp, &ifr,sizeof (ifr))) +if (copy_to_user (argp, &ifr, ifreq_len)) ret = -EFAULT ; goto unlock; }
@@ -1162,7 +1163,7 @@ static long tun_chr_ioctl(struct file *file, unsigned int cmd,if (ret)break ; -if (copy_to_user (argp, &ifr,sizeof (ifr))) +if (copy_to_user (argp, &ifr, ifreq_len)) ret = -EFAULT ;break ;
@@ -1236,7 +1237,7 @@ static long tun_chr_ioctl(struct file *file, unsigned int cmd,/* Get hw addres */ memcpy (ifr.ifr_hwaddr.sa_data, tun->dev->dev_addr,ETH_ALEN ); ifr.ifr_hwaddr.sa_family = tun->dev->type; -if (copy_to_user (argp, &ifr,sizeof ifr)) +if (copy_to_user (argp, &ifr, ifreq_len)) ret = -EFAULT ;break ;
@@ -1275,6 +1276,43 @@ unlock:return ret; } +static long tun_chr_ioctl (struct file *file, +unsigned int cmd,unsigned long arg) +{ +return __tun_chr_ioctl (file, cmd, arg,sizeof (struct ifreq )); +} + +#ifdef CONFIG_COMPAT +static long tun_chr_compat_ioctl (struct file *file, +unsigned int cmd,unsigned long arg) +{ +int ret; + +switch (cmd) { +case TUNSETIFF : +case TUNGETIFF : +case TUNSETTXFILTER : +case TUNGETSNDBUF : +case TUNSETSNDBUF : +case SIOCGIFHWADDR : +case SIOCSIFHWADDR : + arg = (unsigned long )compat_ptr (arg); +break ; +default : + arg = (compat_ulong_t )arg; +break ; + } + +/* +* compat_ifreq is shorter than ifreq, so we must not access beyond +* the end of that structure. All fields that are used in this +* driver are compatible though, we don't need to convert the +* contents. +*/ +return __tun_chr_ioctl (file, cmd, arg,sizeof (struct compat_ifreq )); +} +#endif /* CONFIG_COMPAT */ +static int tun_chr_fasync (int fd,struct file *file,int on) {struct tun_struct *tun =tun_get (file);
@@ -1359,7 +1397,10 @@ static const struct file_operations tun_fops = { .write = do_sync_write, .aio_write = tun_chr_aio_write, .poll = tun_chr_poll, - .unlocked_ioctl = tun_chr_ioctl, + .unlocked_ioctl = tun_chr_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = tun_chr_compat_ioctl, +#endif .open = tun_chr_open, .release = tun_chr_close, .fasync = tun_chr_fasync
fs/compat_ioctl.c +0 -20
@@ -539,12 +539,6 @@ static int dev_ifsioc(unsigned int fd, unsigned int cmd, unsigned long arg)set_fs (old_fs);if (!err) {switch (cmd) { -/* TUNSETIFF is defined as _IOW, it should be _IORW -* as the data is copied back to user space, but that -* cannot be fixed without breaking all existing apps. -*/ -case TUNSETIFF : -case TUNGETIFF :case SIOCGIFFLAGS :case SIOCGIFMETRIC :case SIOCGIFMTU :
@@ -1979,18 +1973,6 @@ COMPATIBLE_IOCTL(SCSI_IOCTL_SEND_COMMAND) COMPATIBLE_IOCTL(SCSI_IOCTL_PROBE_HOST) COMPATIBLE_IOCTL(SCSI_IOCTL_GET_PCI) #endif -/* Big T */ -COMPATIBLE_IOCTL(TUNSETNOCSUM) -COMPATIBLE_IOCTL(TUNSETDEBUG) -COMPATIBLE_IOCTL(TUNSETPERSIST) -COMPATIBLE_IOCTL(TUNSETOWNER) -COMPATIBLE_IOCTL(TUNSETLINK) -COMPATIBLE_IOCTL(TUNSETGROUP) -COMPATIBLE_IOCTL(TUNGETFEATURES) -COMPATIBLE_IOCTL(TUNSETOFFLOAD) -COMPATIBLE_IOCTL(TUNSETTXFILTER) -COMPATIBLE_IOCTL(TUNGETSNDBUF) -COMPATIBLE_IOCTL(TUNSETSNDBUF) /* Big V */ COMPATIBLE_IOCTL(VT_SETMODE) COMPATIBLE_IOCTL(VT_GETMODE)
@@ -2571,8 +2553,6 @@ HANDLE_IOCTL(SIOCSIFPFLAGS, dev_ifsioc) HANDLE_IOCTL(SIOCGIFPFLAGS, dev_ifsioc) HANDLE_IOCTL(SIOCGIFTXQLEN, dev_ifsioc) HANDLE_IOCTL(SIOCSIFTXQLEN, dev_ifsioc) -HANDLE_IOCTL(TUNSETIFF, dev_ifsioc) -HANDLE_IOCTL(TUNGETIFF, dev_ifsioc) HANDLE_IOCTL(SIOCETHTOOL, ethtool_ioctl) HANDLE_IOCTL(SIOCBONDENSLAVE, bond_ioctl)HANDLE_IOCTL (SIOCBONDRELEASE , bond_ioctl)
Signature · 1 line
1.6.3.3
PATCH 3/7 net, compat_ioctl: handle socket ioctl abuses in tty drivers
In reply to Arnd BergmannSlip and a few other drivers use the same ioctl numbers on tty devices that are normally meant for sockets. This causes problems with our compat_ioctl handling that tries to convert the data structures in a different format.
Fortunately, these five drivers all use 32 bit compatible data structures in the ioctl numbers, so we can just add a trivial compat_ioctl conversion function to each of them.
SIOCSIFENCAP and SIOCGIFENCAP do not need to live in fs/compat_ioctl.c after this any more, and they are not used on any sockets.
--- drivers/net/hamradio/6pack.c | 16 ++++++++++++++++ drivers/net/hamradio/mkiss.c | 16 ++++++++++++++++ drivers/net/slip.c | 21 +++++++++++++++++++++ drivers/net/wan/x25_asy.c | 15 +++++++++++++++ drivers/net/wireless/strip.c | 12 ++++++++++++ fs/compat_ioctl.c | 2 -- 6 files changed, 80 insertions(+), 2 deletions(-)
drivers/net/hamradio/6pack.c +16 -0
@@ -777,6 +777,21 @@ static int sixpack_ioctl(struct tty_struct *tty, struct file *file,return err; } +static long sixpack_compat_ioctl (struct tty_struct * tty,struct file * file, +unsigned int cmd,unsigned long arg) +{ +switch (cmd) { +case SIOCGIFNAME : +case SIOCGIFENCAP : +case SIOCSIFENCAP : +case SIOCSIFHWADDR : +return sixpack_ioctl (tty, file, cmd, + (unsigned long )compat_ptr (arg)); + } + +return -ENOIOCTLCMD ; +} +static struct tty_ldisc_ops sp_ldisc = { .owner =THIS_MODULE , .magic =TTY_LDISC_MAGIC ,
@@ -784,6 +799,7 @@ static struct tty_ldisc_ops sp_ldisc = { .open = sixpack_open, .close = sixpack_close, .ioctl = sixpack_ioctl, + .compat_ioctl = sixpack_compat_ioctl, .receive_buf = sixpack_receive_buf, .write_wakeup = sixpack_write_wakeup, };
drivers/net/hamradio/mkiss.c +16 -0
@@ -898,6 +898,21 @@ static int mkiss_ioctl(struct tty_struct *tty, struct file *file,return err; } +static long mkiss_compat_ioctl (struct tty_struct *tty,struct file *file, +unsigned int cmd,unsigned long arg) +{ +switch (arg) { +case SIOCGIFNAME : +case SIOCGIFENCAP : +case SIOCSIFENCAP : +case SIOCSIFHWADDR : +return mkiss_ioctl (tty, file, cmd, + (unsigned long )compat_ptr (arg)); + } + +return -ENOIOCTLCMD ; +} +/* * Handle the 'receiver data ready' interrupt. * This function is called by the 'tty_io' module in the kernel when
@@ -972,6 +987,7 @@ static struct tty_ldisc_ops ax_ldisc = { .open = mkiss_open, .close = mkiss_close, .ioctl = mkiss_ioctl, + .compat_ioctl = mkiss_compat_ioctl, .receive_buf = mkiss_receive_buf, .write_wakeup = mkiss_write_wakeup };
drivers/net/slip.c +21 -0
@@ -1169,6 +1169,26 @@ static int slip_ioctl(struct tty_struct *tty, struct file *file, } } +static long slip_compat_ioctl (struct tty_struct *tty,struct file *file, +unsigned int cmd,unsigned long arg) +{ +switch (cmd) { +case SIOCGIFNAME : +case SIOCGIFENCAP : +case SIOCSIFENCAP : +case SIOCSIFHWADDR : +case SIOCSKEEPALIVE : +case SIOCGKEEPALIVE : +case SIOCSOUTFILL : +case SIOCGOUTFILL : +return slip_ioctl (tty, file, cmd, + (unsigned long )compat_ptr (arg)); + } + +return -ENOIOCTLCMD ; +} + +/* VSV changes start here */ #ifdef CONFIG_SLIP_SMART /* function do_ioctl called from net/core/dev.c
@@ -1261,6 +1281,7 @@ static struct tty_ldisc_ops sl_ldisc = { .close = slip_close, .hangup = slip_hangup, .ioctl = slip_ioctl, + .compat_ioctl = slip_compat_ioctl, .receive_buf = slip_receive_buf, .write_wakeup = slip_write_wakeup, };
drivers/net/wan/x25_asy.c +15 -0
@@ -705,6 +705,20 @@ static int x25_asy_ioctl(struct tty_struct *tty, struct file *file, } } +static long x25_asy_compat_ioctl (struct tty_struct *tty,struct file *file, +unsigned int cmd,unsigned long arg) +{ +switch (cmd) { +case SIOCGIFNAME : +case SIOCSIFHWADDR : +return x25_asy_ioctl (tty, file, cmd, + (unsigned long)compat_ptr(arg); + } + +return -ENOIOCTLCMD ; +} + +static int x25_asy_open_dev (struct net_device *dev) {struct x25_asy *sl =netdev_priv (dev);
@@ -754,6 +768,7 @@ static struct tty_ldisc_ops x25_ldisc = { .open = x25_asy_open_tty, .close = x25_asy_close_tty, .ioctl = x25_asy_ioctl, + .compat_ioctl = x25_asy_compat_ioctl, .receive_buf = x25_asy_receive_buf, .write_wakeup = x25_asy_write_wakeup, };
drivers/net/wireless/strip.c +12 -0
@@ -2725,6 +2725,18 @@ static int strip_ioctl(struct tty_struct *tty, struct file *file,return 0 ; } +static long strip_compat_ioctl (struct tty_struct *tty,struct file *file, +unsigned int cmd,unsigned long arg) +{ +switch (cmd) { +case SIOCGIFNAME : +case SIOCSIFHWADDR : +return strip_ioctl (tty, file, cmd, + (unsigned long )compat_ptr (arg)); + } +return -ENOIOCTLCMD ; +} +/************************************************************************/ /* Initialization */
fs/compat_ioctl.c +0 -2
@@ -2020,8 +2020,6 @@ COMPATIBLE_IOCTL(FIOGETOWN) COMPATIBLE_IOCTL(SIOCGPGRP) COMPATIBLE_IOCTL(SIOCATMARK) COMPATIBLE_IOCTL(SIOCSIFLINK) -COMPATIBLE_IOCTL(SIOCSIFENCAP) -COMPATIBLE_IOCTL(SIOCGIFENCAP) COMPATIBLE_IOCTL(SIOCSIFNAME) COMPATIBLE_IOCTL(SIOCSARP) COMPATIBLE_IOCTL(SIOCGARP)
Signature · 1 line
1.6.3.3
PATCH 4/7 appletalk: handle SIOCATALKDIFADDR compat ioctl
In reply to Arnd BergmannWe must not have a compat ioctl handler for SIOCATALKDIFADDR in common code, because the same number is used in other protocols with different data structures.
--- fs/compat_ioctl.c | 1 - net/appletalk/ddp.c | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-)
fs/compat_ioctl.c +0 -1
@@ -2536,7 +2536,6 @@ HANDLE_IOCTL(SIOCSIFHWBROADCAST, dev_ifsioc)HANDLE_IOCTL (SIOCSHWTSTAMP , dev_ifsioc) /* ioctls used by appletalk ddp.c */ -HANDLE_IOCTL(SIOCATALKDIFADDR, dev_ifsioc) HANDLE_IOCTL(SIOCDIFADDR, dev_ifsioc) HANDLE_IOCTL(SIOCSARP, dev_ifsioc)HANDLE_IOCTL (SIOCDARP , dev_ifsioc)
net/appletalk/ddp.c +7 -5
@@ -1810,12 +1810,14 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)static int atalk_compat_ioctl (struct socket *sock,unsigned int cmd,unsigned long arg) {/* -* All Appletalk ioctls except SIOCATALKDIFADDR are standard. And -* SIOCATALKDIFADDR is handled by upper layer as well, so there is -* nothing to do. Eventually SIOCATALKDIFADDR should be moved -* here so there is no generic SIOCPROTOPRIVATE translation in the -* system. +* SIOCATALKDIFADDR is a SIOCPROTOPRIVATE ioctl number, so we +* cannot handle it in common code. The data we access if ifreq +* here is compatible, so we can simply call the native +* handler. */ +if (cmd ==SIOCATALKDIFADDR ) +return atalk_ioctl (sock, cmd, (unsigned long )compat_ptr (arg)); +return -ENOIOCTLCMD ; }#endif
Signature · 1 line
1.6.3.3
PATCH 5/7 copy socket ioctl code to net/socket.h
In reply to Arnd BergmannThis makes an identical copy of the socket compat_ioctl code from fs/compat_ioctl.c to net/socket.c, as a preparation for moving the functionality in a way that can be easily reviewed.
The code is hidden inside of #if 0 and gets activated in the patch that will make it work.
--- net/socket.c | 717 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 717 insertions(+), 0 deletions(-)
net/socket.c +717 -0
@@ -2300,6 +2300,723 @@ void socket_seq_show(struct seq_file *seq)#endif /* CONFIG_PROC_FS */ #ifdef CONFIG_COMPAT +#if 0 +static int do_siocgstamp(unsigned int fd, unsigned int cmd, unsigned long arg) +{ + struct compat_timeval __user *up = compat_ptr(arg); + struct timeval ktv; + mm_segment_t old_fs = get_fs(); + int err; + + set_fs(KERNEL_DS); + err = sys_ioctl(fd, cmd, (unsigned long)&ktv); + set_fs(old_fs); + if(!err) { + err = put_user(ktv.tv_sec, &up->tv_sec); + err |= __put_user(ktv.tv_usec, &up->tv_usec); + } + return err; +} + +static int do_siocgstampns(unsigned int fd, unsigned int cmd, unsigned long arg) +{ + struct compat_timespec __user *up = compat_ptr(arg); + struct timespec kts; + mm_segment_t old_fs = get_fs(); + int err; + + set_fs(KERNEL_DS); + err = sys_ioctl(fd, cmd, (unsigned long)&kts); + set_fs(old_fs); + if (!err) { + err = put_user(kts.tv_sec, &up->tv_sec); + err |= __put_user(kts.tv_nsec, &up->tv_nsec); + } + return err; +} + +struct ifmap32 { + compat_ulong_t mem_start; + compat_ulong_t mem_end; + unsigned short base_addr; + unsigned char irq; + unsigned char dma; + unsigned char port; +}; + +struct ifreq32 { +#define IFHWADDRLEN 6 +#define IFNAMSIZ 16 + union { + char ifrn_name[IFNAMSIZ]; /* if name, e.g. "en0" */ + } ifr_ifrn; + union { + struct sockaddr ifru_addr; + struct sockaddr ifru_dstaddr; + struct sockaddr ifru_broadaddr; + struct sockaddr ifru_netmask; + struct sockaddr ifru_hwaddr; + short ifru_flags; + compat_int_t ifru_ivalue; + compat_int_t ifru_mtu; + struct ifmap32 ifru_map; + char ifru_slave[IFNAMSIZ]; /* Just fits the size */ + char ifru_newname[IFNAMSIZ]; + compat_caddr_t ifru_data; + /* XXXX? ifru_settings should be here */ + } ifr_ifru; +}; + +struct ifconf32 { + compat_int_t ifc_len; /* size of buffer */ + compat_caddr_t ifcbuf; +}; + +static int dev_ifname32(unsigned int fd, unsigned int cmd, unsigned long arg) +{ + struct ifreq __user *uifr; + int err; + + uifr = compat_alloc_user_space(sizeof(struct ifreq)); + if (copy_in_user(uifr, compat_ptr(arg), sizeof(struct ifreq32))) + return -EFAULT; + + err = sys_ioctl(fd, SIOCGIFNAME, (unsigned long)uifr); + if (err) + return err; + + if (copy_in_user(compat_ptr(arg), uifr, sizeof(struct ifreq32))) + return -EFAULT; + + return 0; +} + +static int dev_ifconf(unsigned int fd, unsigned int cmd, unsigned long arg) +{ + struct ifconf32 ifc32; + struct ifconf ifc; + struct ifconf __user *uifc; + struct ifreq32 __user *ifr32; + struct ifreq __user *ifr; + unsigned int i, j; + int err; + + if (copy_from_user(&ifc32, compat_ptr(arg), sizeof(struct ifconf32))) + return -EFAULT; + + if (ifc32.ifcbuf == 0) { + ifc32.ifc_len = 0; + ifc.ifc_len = 0; + ifc.ifc_req = NULL; + uifc = compat_alloc_user_space(sizeof(struct ifconf)); + } else { + size_t len =((ifc32.ifc_len / sizeof (struct ifreq32)) + 1) * + sizeof (struct ifreq); + uifc = compat_alloc_user_space(sizeof(struct ifconf) + len); + ifc.ifc_len = len; + ifr = ifc.ifc_req = (void __user *)(uifc + 1); + ifr32 = compat_ptr(ifc32.ifcbuf); + for (i = 0; i < ifc32.ifc_len; i += sizeof (struct ifreq32)) { + if (copy_in_user(ifr, ifr32, sizeof(struct ifreq32))) + return -EFAULT; + ifr++; + ifr32++; + } + } + if (copy_to_user(uifc, &ifc, sizeof(struct ifconf))) + return -EFAULT; + + err = sys_ioctl (fd, SIOCGIFCONF, (unsigned long)uifc); + if (err) + return err; + + if (copy_from_user(&ifc, uifc, sizeof(struct ifconf))) + return -EFAULT; + + ifr = ifc.ifc_req; + ifr32 = compat_ptr(ifc32.ifcbuf); + for (i = 0, j = 0; + i + sizeof (struct ifreq32) <= ifc32.ifc_len && j < ifc.ifc_len; + i += sizeof (struct ifreq32), j += sizeof (struct ifreq)) { + if (copy_in_user(ifr32, ifr, sizeof (struct ifreq32))) + return -EFAULT; + ifr32++; + ifr++; + } + + if (ifc32.ifcbuf == 0) { + /* Translate from 64-bit structure multiple to + * a 32-bit one. + */ + i = ifc.ifc_len; + i = ((i / sizeof(struct ifreq)) * sizeof(struct ifreq32)); + ifc32.ifc_len = i; + } else { + ifc32.ifc_len = i; + } + if (copy_to_user(compat_ptr(arg), &ifc32, sizeof(struct ifconf32))) + return -EFAULT; + + return 0; +} + +static int ethtool_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) +{ + struct ifreq __user *ifr; + struct ifreq32 __user *ifr32; + u32 data; + void __user *datap; + + ifr = compat_alloc_user_space(sizeof(*ifr)); + ifr32 = compat_ptr(arg); + + if (copy_in_user(&ifr->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, &ifr->ifr_ifru.ifru_data)) + return -EFAULT; + + return sys_ioctl(fd, cmd, (unsigned long) ifr); +} + +static int bond_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) +{ + struct ifreq kifr; + struct ifreq __user *uifr; + struct ifreq32 __user *ifr32 = compat_ptr(arg); + mm_segment_t old_fs; + int err; + u32 data; + void __user *datap; + + switch (cmd) { + case SIOCBONDENSLAVE: + case SIOCBONDRELEASE: + case SIOCBONDSETHWADDR: + case SIOCBONDCHANGEACTIVE: + if (copy_from_user(&kifr, ifr32, sizeof(struct ifreq32))) + return -EFAULT; + + old_fs = get_fs(); + set_fs (KERNEL_DS); + err = sys_ioctl (fd, cmd, (unsigned long)&kifr); + set_fs (old_fs); + + 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 sys_ioctl (fd, cmd, (unsigned long)uifr); + default: + return -EINVAL; + }; +} + +static int siocdevprivate_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) +{ + struct ifreq __user *u_ifreq64; + struct ifreq32 __user *u_ifreq32 = compat_ptr(arg); + char tmp_buf[IFNAMSIZ]; + void __user *data64; + u32 data32; + + if (copy_from_user(&tmp_buf[0], &(u_ifreq32->ifr_ifrn.ifrn_name[0]), + IFNAMSIZ)) + return -EFAULT; + if (__get_user(data32, &u_ifreq32->ifr_ifru.ifru_data)) + return -EFAULT; + data64 = compat_ptr(data32); + + u_ifreq64 = compat_alloc_user_space(sizeof(*u_ifreq64)); + + /* Don't check these user accesses, just let that get trapped + * in the ioctl handler instead. + */ + if (copy_to_user(&u_ifreq64->ifr_ifrn.ifrn_name[0], &tmp_buf[0], + IFNAMSIZ)) + return -EFAULT; + if (__put_user(data64, &u_ifreq64->ifr_ifru.ifru_data)) + return -EFAULT; + + return sys_ioctl(fd, cmd, (unsigned long) u_ifreq64); +} + +static int dev_ifsioc(unsigned int fd, unsigned int cmd, unsigned long arg) +{ + struct ifreq ifr; + struct ifreq32 __user *uifr32; + struct ifmap32 __user *uifmap32; + mm_segment_t old_fs; + int err; + + uifr32 = compat_ptr(arg); + uifmap32 = &uifr32->ifr_ifru.ifru_map; + switch (cmd) { + case SIOCSIFMAP: + err = copy_from_user(&ifr, uifr32, sizeof(ifr.ifr_name)); + err |= __get_user(ifr.ifr_map.mem_start, &uifmap32->mem_start); + err |= __get_user(ifr.ifr_map.mem_end, &uifmap32->mem_end); + err |= __get_user(ifr.ifr_map.base_addr, &uifmap32->base_addr); + err |= __get_user(ifr.ifr_map.irq, &uifmap32->irq); + err |= __get_user(ifr.ifr_map.dma, &uifmap32->dma); + err |= __get_user(ifr.ifr_map.port, &uifmap32->port); + if (err) + return -EFAULT; + break; + case SIOCSHWTSTAMP: + if (copy_from_user(&ifr, uifr32, sizeof(*uifr32))) + return -EFAULT; + ifr.ifr_data = compat_ptr(uifr32->ifr_ifru.ifru_data); + break; + default: + if (copy_from_user(&ifr, uifr32, sizeof(*uifr32))) + return -EFAULT; + break; + } + old_fs = get_fs(); + set_fs (KERNEL_DS); + err = sys_ioctl (fd, cmd, (unsigned long)&ifr); + set_fs (old_fs); + if (!err) { + switch (cmd) { + case SIOCGIFFLAGS: + case SIOCGIFMETRIC: + case SIOCGIFMTU: + case SIOCGIFMEM: + case SIOCGIFHWADDR: + case SIOCGIFINDEX: + case SIOCGIFADDR: + case SIOCGIFBRDADDR: + case SIOCGIFDSTADDR: + case SIOCGIFNETMASK: + case SIOCGIFTXQLEN: + if (copy_to_user(uifr32, &ifr, sizeof(*uifr32))) + return -EFAULT; + break; + case SIOCGIFMAP: + err = copy_to_user(uifr32, &ifr, sizeof(ifr.ifr_name)); + err |= __put_user(ifr.ifr_map.mem_start, &uifmap32->mem_start); + err |= __put_user(ifr.ifr_map.mem_end, &uifmap32->mem_end); + err |= __put_user(ifr.ifr_map.base_addr, &uifmap32->base_addr); + err |= __put_user(ifr.ifr_map.irq, &uifmap32->irq); + err |= __put_user(ifr.ifr_map.dma, &uifmap32->dma); + err |= __put_user(ifr.ifr_map.port, &uifmap32->port); + if (err) + err = -EFAULT; + break; + } + } + return err; +} + +struct rtentry32 { + u32 rt_pad1; + struct sockaddr rt_dst; /* target address */ + struct sockaddr rt_gateway; /* gateway addr (RTF_GATEWAY) */ + struct sockaddr rt_genmask; /* target network mask (IP) */ + unsigned short rt_flags; + short rt_pad2; + u32 rt_pad3; + unsigned char rt_tos; + unsigned char rt_class; + short rt_pad4; + short rt_metric; /* +1 for binary compatibility! */ + /* char * */ u32 rt_dev; /* forcing the device at add */ + u32 rt_mtu; /* per route MTU/Window */ + u32 rt_window; /* Window clamping */ + unsigned short rt_irtt; /* Initial RTT */ + +}; + +struct in6_rtmsg32 { + struct in6_addr rtmsg_dst; + struct in6_addr rtmsg_src; + struct in6_addr rtmsg_gateway; + u32 rtmsg_type; + u16 rtmsg_dst_len; + u16 rtmsg_src_len; + u32 rtmsg_metric; + u32 rtmsg_info; + u32 rtmsg_flags; + s32 rtmsg_ifindex; +}; + +static int routing_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) +{ + int ret; + void *r = NULL; + struct in6_rtmsg r6; + struct rtentry r4; + char devname[16]; + u32 rtdev; + mm_segment_t old_fs = get_fs(); + + struct socket *mysock = sockfd_lookup(fd, &ret); + + if (mysock && mysock->sk && mysock->sk->sk_family == AF_INET6) { /* ipv6 */ + struct in6_rtmsg32 __user *ur6 = compat_ptr(arg); + ret = copy_from_user (&r6.rtmsg_dst, &(ur6->rtmsg_dst), + 3 * sizeof(struct in6_addr)); + ret |= __get_user (r6.rtmsg_type, &(ur6->rtmsg_type)); + ret |= __get_user (r6.rtmsg_dst_len, &(ur6->rtmsg_dst_len)); + ret |= __get_user (r6.rtmsg_src_len, &(ur6->rtmsg_src_len)); + ret |= __get_user (r6.rtmsg_metric, &(ur6->rtmsg_metric)); + ret |= __get_user (r6.rtmsg_info, &(ur6->rtmsg_info)); + ret |= __get_user (r6.rtmsg_flags, &(ur6->rtmsg_flags)); + ret |= __get_user (r6.rtmsg_ifindex, &(ur6->rtmsg_ifindex)); + + r = (void *) &r6; + } else { /* ipv4 */ + struct rtentry32 __user *ur4 = compat_ptr(arg); + ret = copy_from_user (&r4.rt_dst, &(ur4->rt_dst), + 3 * sizeof(struct sockaddr)); + ret |= __get_user (r4.rt_flags, &(ur4->rt_flags)); + ret |= __get_user (r4.rt_metric, &(ur4->rt_metric)); + ret |= __get_user (r4.rt_mtu, &(ur4->rt_mtu)); + ret |= __get_user (r4.rt_window, &(ur4->rt_window)); + ret |= __get_user (r4.rt_irtt, &(ur4->rt_irtt)); + ret |= __get_user (rtdev, &(ur4->rt_dev)); + if (rtdev) { + ret |= copy_from_user (devname, compat_ptr(rtdev), 15); + r4.rt_dev = devname; devname[15] = 0; + } else + r4.rt_dev = NULL; + + r = (void *) &r4; + } + + if (ret) { + ret = -EFAULT; + goto out; + } + + set_fs (KERNEL_DS); + ret = sys_ioctl (fd, cmd, (unsigned long) r); + set_fs (old_fs); + +out: + if (mysock) + sockfd_put(mysock); + + return ret; +} + +/* Since old style bridge ioctl's endup using SIOCDEVPRIVATE + * for some operations; this forces use of the newer bridge-utils that + * use compatiable ioctls + */ +static int old_bridge_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) +{ + u32 tmp; + + if (get_user(tmp, (u32 __user *) arg)) + return -EFAULT; + if (tmp == BRCTL_GET_VERSION) + return BRCTL_VERSION + 1; + return -EINVAL; +} + +struct atmif_sioc32 { + compat_int_t number; + compat_int_t length; + compat_caddr_t arg; +}; + +struct atm_iobuf32 { + compat_int_t length; + compat_caddr_t buffer; +}; + +#define ATM_GETLINKRATE32 _IOW('a', ATMIOC_ITF+1, struct atmif_sioc32) +#define ATM_GETNAMES32 _IOW('a', ATMIOC_ITF+3, struct atm_iobuf32) +#define ATM_GETTYPE32 _IOW('a', ATMIOC_ITF+4, struct atmif_sioc32) +#define ATM_GETESI32 _IOW('a', ATMIOC_ITF+5, struct atmif_sioc32) +#define ATM_GETADDR32 _IOW('a', ATMIOC_ITF+6, struct atmif_sioc32) +#define ATM_RSTADDR32 _IOW('a', ATMIOC_ITF+7, struct atmif_sioc32) +#define ATM_ADDADDR32 _IOW('a', ATMIOC_ITF+8, struct atmif_sioc32) +#define ATM_DELADDR32 _IOW('a', ATMIOC_ITF+9, struct atmif_sioc32) +#define ATM_GETCIRANGE32 _IOW('a', ATMIOC_ITF+10, struct atmif_sioc32) +#define ATM_SETCIRANGE32 _IOW('a', ATMIOC_ITF+11, struct atmif_sioc32) +#define ATM_SETESI32 _IOW('a', ATMIOC_ITF+12, struct atmif_sioc32) +#define ATM_SETESIF32 _IOW('a', ATMIOC_ITF+13, struct atmif_sioc32) +#define ATM_GETSTAT32 _IOW('a', ATMIOC_SARCOM+0, struct atmif_sioc32) +#define ATM_GETSTATZ32 _IOW('a', ATMIOC_SARCOM+1, struct atmif_sioc32) +#define ATM_GETLOOP32 _IOW('a', ATMIOC_SARCOM+2, struct atmif_sioc32) +#define ATM_SETLOOP32 _IOW('a', ATMIOC_SARCOM+3, struct atmif_sioc32) +#define ATM_QUERYLOOP32 _IOW('a', ATMIOC_SARCOM+4, struct atmif_sioc32) + +static struct { + unsigned int cmd32; + unsigned int cmd; +} atm_ioctl_map[] = { + { ATM_GETLINKRATE32, ATM_GETLINKRATE }, + { ATM_GETNAMES32, ATM_GETNAMES }, + { ATM_GETTYPE32, ATM_GETTYPE }, + { ATM_GETESI32, ATM_GETESI }, + { ATM_GETADDR32, ATM_GETADDR }, + { ATM_RSTADDR32, ATM_RSTADDR }, + { ATM_ADDADDR32, ATM_ADDADDR }, + { ATM_DELADDR32, ATM_DELADDR }, + { ATM_GETCIRANGE32, ATM_GETCIRANGE }, + { ATM_SETCIRANGE32, ATM_SETCIRANGE }, + { ATM_SETESI32, ATM_SETESI }, + { ATM_SETESIF32, ATM_SETESIF }, + { ATM_GETSTAT32, ATM_GETSTAT }, + { ATM_GETSTATZ32, ATM_GETSTATZ }, + { ATM_GETLOOP32, ATM_GETLOOP }, + { ATM_SETLOOP32, ATM_SETLOOP }, + { ATM_QUERYLOOP32, ATM_QUERYLOOP } +}; + +#define NR_ATM_IOCTL ARRAY_SIZE(atm_ioctl_map) + +static int do_atm_iobuf(unsigned int fd, unsigned int cmd, unsigned long arg) +{ + struct atm_iobuf __user *iobuf; + struct atm_iobuf32 __user *iobuf32; + u32 data; + void __user *datap; + int len, err; + + iobuf = compat_alloc_user_space(sizeof(*iobuf)); + iobuf32 = compat_ptr(arg); + + if (get_user(len, &iobuf32->length) || + get_user(data, &iobuf32->buffer)) + return -EFAULT; + datap = compat_ptr(data); + if (put_user(len, &iobuf->length) || + put_user(datap, &iobuf->buffer)) + return -EFAULT; + + err = sys_ioctl(fd, cmd, (unsigned long)iobuf); + + if (!err) { + if (copy_in_user(&iobuf32->length, &iobuf->length, + sizeof(int))) + err = -EFAULT; + } + + return err; +} + +static int do_atmif_sioc(unsigned int fd, unsigned int cmd, unsigned long arg) +{ + struct atmif_sioc __user *sioc; + struct atmif_sioc32 __user *sioc32; + u32 data; + void __user *datap; + int err; + + sioc = compat_alloc_user_space(sizeof(*sioc)); + sioc32 = compat_ptr(arg); + + if (copy_in_user(&sioc->number, &sioc32->number, 2 * sizeof(int)) || + get_user(data, &sioc32->arg)) + return -EFAULT; + datap = compat_ptr(data); + if (put_user(datap, &sioc->arg)) + return -EFAULT; + + err = sys_ioctl(fd, cmd, (unsigned long) sioc); + + if (!err) { + if (copy_in_user(&sioc32->length, &sioc->length, + sizeof(int))) + err = -EFAULT; + } + return err; +} + +static int do_atm_ioctl(unsigned int fd, unsigned int cmd32, unsigned long arg) +{ + int i; + unsigned int cmd = 0; + + switch (cmd32) { + case SONET_GETSTAT: + case SONET_GETSTATZ: + case SONET_GETDIAG: + case SONET_SETDIAG: + case SONET_CLRDIAG: + case SONET_SETFRAMING: + case SONET_GETFRAMING: + case SONET_GETFRSENSE: + return do_atmif_sioc(fd, cmd32, arg); + } + + for (i = 0; i < NR_ATM_IOCTL; i++) { + if (cmd32 == atm_ioctl_map[i].cmd32) { + cmd = atm_ioctl_map[i].cmd; + break; + } + } + if (i == NR_ATM_IOCTL) + return -EINVAL; + + switch (cmd) { + case ATM_GETNAMES: + return do_atm_iobuf(fd, cmd, arg); + + case ATM_GETLINKRATE: + case ATM_GETTYPE: + case ATM_GETESI: + case ATM_GETADDR: + case ATM_RSTADDR: + case ATM_ADDADDR: + case ATM_DELADDR: + case ATM_GETCIRANGE: + case ATM_SETCIRANGE: + case ATM_SETESI: + case ATM_SETESIF: + case ATM_GETSTAT: + case ATM_GETSTATZ: + case ATM_GETLOOP: + case ATM_SETLOOP: + case ATM_QUERYLOOP: + return do_atmif_sioc(fd, cmd, arg); + } + + return -EINVAL; +} + + +/* bridge */ +HANDLE_IOCTL(SIOCSIFBR, old_bridge_ioctl) +HANDLE_IOCTL(SIOCGIFBR, old_bridge_ioctl) +#ifdef CONFIG_NET +HANDLE_IOCTL(SIOCGIFNAME, dev_ifname32) +HANDLE_IOCTL(SIOCGIFCONF, dev_ifconf) +HANDLE_IOCTL(SIOCGIFFLAGS, dev_ifsioc) +HANDLE_IOCTL(SIOCSIFFLAGS, dev_ifsioc) +HANDLE_IOCTL(SIOCGIFMETRIC, dev_ifsioc) +HANDLE_IOCTL(SIOCSIFMETRIC, dev_ifsioc) +HANDLE_IOCTL(SIOCGIFMTU, dev_ifsioc) +HANDLE_IOCTL(SIOCSIFMTU, dev_ifsioc) +HANDLE_IOCTL(SIOCGIFMEM, dev_ifsioc) +HANDLE_IOCTL(SIOCSIFMEM, dev_ifsioc) +HANDLE_IOCTL(SIOCGIFHWADDR, dev_ifsioc) +HANDLE_IOCTL(SIOCSIFHWADDR, dev_ifsioc) +HANDLE_IOCTL(SIOCADDMULTI, dev_ifsioc) +HANDLE_IOCTL(SIOCDELMULTI, dev_ifsioc) +HANDLE_IOCTL(SIOCGIFINDEX, dev_ifsioc) +HANDLE_IOCTL(SIOCGIFMAP, dev_ifsioc) +HANDLE_IOCTL(SIOCSIFMAP, dev_ifsioc) +HANDLE_IOCTL(SIOCGIFADDR, dev_ifsioc) +HANDLE_IOCTL(SIOCSIFADDR, dev_ifsioc) +HANDLE_IOCTL(SIOCSIFHWBROADCAST, dev_ifsioc) +HANDLE_IOCTL(SIOCSHWTSTAMP, dev_ifsioc) + +HANDLE_IOCTL(SIOCDIFADDR, dev_ifsioc) +HANDLE_IOCTL(SIOCSARP, dev_ifsioc) +HANDLE_IOCTL(SIOCDARP, dev_ifsioc) + +HANDLE_IOCTL(SIOCGIFBRDADDR, dev_ifsioc) +HANDLE_IOCTL(SIOCSIFBRDADDR, dev_ifsioc) +HANDLE_IOCTL(SIOCGIFDSTADDR, dev_ifsioc) +HANDLE_IOCTL(SIOCSIFDSTADDR, dev_ifsioc) +HANDLE_IOCTL(SIOCGIFNETMASK, dev_ifsioc) +HANDLE_IOCTL(SIOCSIFNETMASK, dev_ifsioc) +HANDLE_IOCTL(SIOCSIFPFLAGS, dev_ifsioc) +HANDLE_IOCTL(SIOCGIFPFLAGS, dev_ifsioc) +HANDLE_IOCTL(SIOCGIFTXQLEN, dev_ifsioc) +HANDLE_IOCTL(SIOCSIFTXQLEN, dev_ifsioc) +HANDLE_IOCTL(SIOCETHTOOL, ethtool_ioctl) +HANDLE_IOCTL(SIOCBONDENSLAVE, bond_ioctl) +HANDLE_IOCTL(SIOCBONDRELEASE, bond_ioctl) +HANDLE_IOCTL(SIOCBONDSETHWADDR, bond_ioctl) +HANDLE_IOCTL(SIOCBONDSLAVEINFOQUERY, bond_ioctl) +HANDLE_IOCTL(SIOCBONDINFOQUERY, bond_ioctl) +HANDLE_IOCTL(SIOCBONDCHANGEACTIVE, bond_ioctl) +HANDLE_IOCTL(SIOCADDRT, routing_ioctl) +HANDLE_IOCTL(SIOCDELRT, routing_ioctl) +HANDLE_IOCTL(SIOCBRADDIF, dev_ifsioc) +HANDLE_IOCTL(SIOCBRDELIF, dev_ifsioc) +/* Note SIOCRTMSG is no longer, so this is safe and * the user would have seen just an -EINVAL anyways. */ +HANDLE_IOCTL(SIOCRTMSG, ret_einval) +HANDLE_IOCTL(SIOCGSTAMP, do_siocgstamp) +HANDLE_IOCTL(SIOCGSTAMPNS, do_siocgstampns) +#endif +IGNORE_IOCTL(SIOCGIFCOUNT) +/* Little a */ +COMPATIBLE_IOCTL(ATMSIGD_CTRL) +COMPATIBLE_IOCTL(ATMARPD_CTRL) +COMPATIBLE_IOCTL(ATMLEC_CTRL) +COMPATIBLE_IOCTL(ATMLEC_MCAST) +COMPATIBLE_IOCTL(ATMLEC_DATA) +COMPATIBLE_IOCTL(ATM_SETSC) +COMPATIBLE_IOCTL(SIOCSIFATMTCP) +COMPATIBLE_IOCTL(SIOCMKCLIP) +COMPATIBLE_IOCTL(ATMARP_MKIP) +COMPATIBLE_IOCTL(ATMARP_SETENTRY) +COMPATIBLE_IOCTL(ATMARP_ENCAP) +COMPATIBLE_IOCTL(ATMTCP_CREATE) +COMPATIBLE_IOCTL(ATMTCP_REMOVE) +COMPATIBLE_IOCTL(ATMMPC_CTRL) +COMPATIBLE_IOCTL(ATMMPC_DATA) +HANDLE_IOCTL(ATM_GETLINKRATE32, do_atm_ioctl) +HANDLE_IOCTL(ATM_GETNAMES32, do_atm_ioctl) +HANDLE_IOCTL(ATM_GETTYPE32, do_atm_ioctl) +HANDLE_IOCTL(ATM_GETESI32, do_atm_ioctl) +HANDLE_IOCTL(ATM_GETADDR32, do_atm_ioctl) +HANDLE_IOCTL(ATM_RSTADDR32, do_atm_ioctl) +HANDLE_IOCTL(ATM_ADDADDR32, do_atm_ioctl) +HANDLE_IOCTL(ATM_DELADDR32, do_atm_ioctl) +HANDLE_IOCTL(ATM_GETCIRANGE32, do_atm_ioctl) +HANDLE_IOCTL(ATM_SETCIRANGE32, do_atm_ioctl) +HANDLE_IOCTL(ATM_SETESI32, do_atm_ioctl) +HANDLE_IOCTL(ATM_SETESIF32, do_atm_ioctl) +HANDLE_IOCTL(ATM_GETSTAT32, do_atm_ioctl) +HANDLE_IOCTL(ATM_GETSTATZ32, do_atm_ioctl) +HANDLE_IOCTL(ATM_GETLOOP32, do_atm_ioctl) +HANDLE_IOCTL(ATM_SETLOOP32, do_atm_ioctl) +HANDLE_IOCTL(ATM_QUERYLOOP32, do_atm_ioctl) +HANDLE_IOCTL(SONET_GETSTAT, do_atm_ioctl) +HANDLE_IOCTL(SONET_GETSTATZ, do_atm_ioctl) +HANDLE_IOCTL(SONET_GETDIAG, do_atm_ioctl) +HANDLE_IOCTL(SONET_SETDIAG, do_atm_ioctl) +HANDLE_IOCTL(SONET_CLRDIAG, do_atm_ioctl) +HANDLE_IOCTL(SONET_SETFRAMING, do_atm_ioctl) +HANDLE_IOCTL(SONET_GETFRAMING, do_atm_ioctl) +HANDLE_IOCTL(SONET_GETFRSENSE, do_atm_ioctl) +COMPATIBLE_IOCTL(FIOSETOWN) +COMPATIBLE_IOCTL(SIOCSPGRP) +COMPATIBLE_IOCTL(FIOGETOWN) +COMPATIBLE_IOCTL(SIOCGPGRP) +COMPATIBLE_IOCTL(SIOCATMARK) +COMPATIBLE_IOCTL(SIOCSIFLINK) +COMPATIBLE_IOCTL(SIOCSIFNAME) +COMPATIBLE_IOCTL(SIOCSARP) +COMPATIBLE_IOCTL(SIOCGARP) +COMPATIBLE_IOCTL(SIOCDARP) +COMPATIBLE_IOCTL(SIOCSRARP) +COMPATIBLE_IOCTL(SIOCGRARP) +COMPATIBLE_IOCTL(SIOCDRARP) +COMPATIBLE_IOCTL(SIOCADDDLCI) +COMPATIBLE_IOCTL(SIOCDELDLCI) +COMPATIBLE_IOCTL(SIOCGMIIPHY) +COMPATIBLE_IOCTL(SIOCGMIIREG) +COMPATIBLE_IOCTL(SIOCSMIIREG) +COMPATIBLE_IOCTL(SIOCGIFVLAN) +COMPATIBLE_IOCTL(SIOCSIFVLAN) +COMPATIBLE_IOCTL(SIOCBRADDBR) +COMPATIBLE_IOCTL(SIOCBRDELBR) +#endif + static long compat_sock_ioctl(struct file *file, unsigned cmd, unsigned long arg) {
Signature · 1 line
1.6.3.3
PATCH 6/7 compat: move sockios handling to net/socket.c
In reply to Arnd BergmannThis removes the original socket compat_ioctl code from fs/compat_ioctl.c and converts the code from the copy in net/socket.c into a single function. We add a few cycles of runtime to compat_sock_ioctl() with the long switch() statement, but gain some cycles in return by simplifying the call chain to get there.
Due to better inlining, save 1.5kb of object size in the process, and enable further savings:
before:
text data bss dec hex filename
13540 18008 2080 33628 835c obj/fs/compat_ioctl.o 14565 636 40 15241 3b89 obj/net/socket.o
after:
text data bss dec hex filename
8916 15176 2080 26172 663c obj/fs/compat_ioctl.o 20725 636 40 21401 5399 obj/net/socket.o
--- fs/compat_ioctl.c | 722 ----------------------------------------------------- net/socket.c | 474 ++++++++++++++++++----------------- 2 files changed, 243 insertions(+), 953 deletions(-)
fs/compat_ioctl.c +0 -722
@@ -246,422 +246,6 @@ static int do_video_set_spu_palette(unsigned int fd, unsigned int cmd, unsignedreturn err; } -#ifdef CONFIG_NET -static int do_siocgstamp (unsigned int fd,unsigned int cmd,unsigned long arg) -{ -struct compat_timeval __user *up =compat_ptr (arg); -struct timeval ktv; -mm_segment_t old_fs =get_fs (); -int err; - -set_fs (KERNEL_DS ); - err =sys_ioctl (fd, cmd, (unsigned long )&ktv); -set_fs (old_fs); -if (!err) { - err =put_user (ktv.tv_sec, &up->tv_sec); - err |=__put_user (ktv.tv_usec, &up->tv_usec); - } -return err; -} - -static int do_siocgstampns (unsigned int fd,unsigned int cmd,unsigned long arg) -{ -struct compat_timespec __user *up =compat_ptr (arg); -struct timespec kts; -mm_segment_t old_fs =get_fs (); -int err; - -set_fs (KERNEL_DS ); - err =sys_ioctl (fd, cmd, (unsigned long )&kts); -set_fs (old_fs); -if (!err) { - err =put_user (kts.tv_sec, &up->tv_sec); - err |=__put_user (kts.tv_nsec, &up->tv_nsec); - } -return err; -} - -struct ifmap32 { -compat_ulong_t mem_start; -compat_ulong_t mem_end; -unsigned short base_addr; -unsigned char irq; -unsigned char dma; -unsigned char port; -}; - -struct ifreq32 { -#define IFHWADDRLEN 6 -#define IFNAMSIZ 16 -union { -char ifrn_name[IFNAMSIZ ];/* if name, e.g. "en0" */ - } ifr_ifrn; -union { -struct sockaddr ifru_addr; -struct sockaddr ifru_dstaddr; -struct sockaddr ifru_broadaddr; -struct sockaddr ifru_netmask; -struct sockaddr ifru_hwaddr; -short ifru_flags; -compat_int_t ifru_ivalue; -compat_int_t ifru_mtu; -struct ifmap32 ifru_map; -char ifru_slave[IFNAMSIZ ];/* Just fits the size */ -char ifru_newname[IFNAMSIZ ]; -compat_caddr_t ifru_data; -/* XXXX? ifru_settings should be here */ - } ifr_ifru; -}; - -struct ifconf32 { -compat_int_t ifc_len;/* size of buffer */ -compat_caddr_t ifcbuf; -}; - -static int dev_ifname32 (unsigned int fd,unsigned int cmd,unsigned long arg) -{ -struct ifreq __user *uifr; -int err; - - uifr =compat_alloc_user_space (sizeof (struct ifreq )); -if (copy_in_user (uifr,compat_ptr (arg),sizeof (struct ifreq32 ))) -return -EFAULT ; - - err =sys_ioctl (fd,SIOCGIFNAME , (unsigned long )uifr); -if (err) -return err; - -if (copy_in_user (compat_ptr (arg), uifr,sizeof (struct ifreq32 ))) -return -EFAULT ; - -return 0 ; -} - -static int dev_ifconf (unsigned int fd,unsigned int cmd,unsigned long arg) -{ -struct ifconf32 ifc32; -struct ifconf ifc; -struct ifconf __user *uifc; -struct ifreq32 __user *ifr32; -struct ifreq __user *ifr; -unsigned int i, j; -int err; - -if (copy_from_user (&ifc32,compat_ptr (arg),sizeof (struct ifconf32 ))) -return -EFAULT ; - -if (ifc32.ifcbuf ==0 ) { - ifc32.ifc_len =0 ; - ifc.ifc_len =0 ; - ifc.ifc_req =NULL ; - uifc =compat_alloc_user_space (sizeof (struct ifconf )); - }else { -size_t len =((ifc32.ifc_len /sizeof (struct ifreq32 )) +1 ) * -sizeof (struct ifreq ); - uifc =compat_alloc_user_space (sizeof (struct ifconf ) + len); - ifc.ifc_len = len; - ifr = ifc.ifc_req = (void __user *)(uifc +1 ); - ifr32 =compat_ptr (ifc32.ifcbuf); -for (i =0 ; i < ifc32.ifc_len; i +=sizeof (struct ifreq32 )) { -if (copy_in_user (ifr, ifr32,sizeof (struct ifreq32 ))) -return -EFAULT ; - ifr++; - ifr32++; - } - } -if (copy_to_user (uifc, &ifc,sizeof (struct ifconf ))) -return -EFAULT ; - - err =sys_ioctl (fd,SIOCGIFCONF , (unsigned long )uifc); -if (err) -return err; - -if (copy_from_user (&ifc, uifc,sizeof (struct ifconf ))) -return -EFAULT ; - - ifr = ifc.ifc_req; - ifr32 =compat_ptr (ifc32.ifcbuf); -for (i =0 , j =0 ; - i +sizeof (struct ifreq32 ) <= ifc32.ifc_len && j < ifc.ifc_len; - i +=sizeof (struct ifreq32 ), j +=sizeof (struct ifreq )) { -if (copy_in_user (ifr32, ifr,sizeof (struct ifreq32 ))) -return -EFAULT ; - ifr32++; - ifr++; - } - -if (ifc32.ifcbuf ==0 ) { -/* Translate from 64-bit structure multiple to -* a 32-bit one. -*/ - i = ifc.ifc_len; - i = ((i /sizeof (struct ifreq )) *sizeof (struct ifreq32 )); - ifc32.ifc_len = i; - }else { - ifc32.ifc_len = i; - } -if (copy_to_user (compat_ptr (arg), &ifc32,sizeof (struct ifconf32 ))) -return -EFAULT ; - -return 0 ; -} - -static int ethtool_ioctl (unsigned int fd,unsigned int cmd,unsigned long arg) -{ -struct ifreq __user *ifr; -struct ifreq32 __user *ifr32; -u32 data; -void __user *datap; - - ifr =compat_alloc_user_space (sizeof (*ifr)); - ifr32 =compat_ptr (arg); - -if (copy_in_user (&ifr->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, &ifr->ifr_ifru.ifru_data)) -return -EFAULT ; - -return sys_ioctl (fd, cmd, (unsigned long ) ifr); -} - -static int bond_ioctl (unsigned int fd,unsigned int cmd,unsigned long arg) -{ -struct ifreq kifr; -struct ifreq __user *uifr; -struct ifreq32 __user *ifr32 =compat_ptr (arg); -mm_segment_t old_fs; -int err; -u32 data; -void __user *datap; - -switch (cmd) { -case SIOCBONDENSLAVE : -case SIOCBONDRELEASE : -case SIOCBONDSETHWADDR : -case SIOCBONDCHANGEACTIVE : -if (copy_from_user (&kifr, ifr32,sizeof (struct ifreq32 ))) -return -EFAULT ; - - old_fs =get_fs (); -set_fs (KERNEL_DS ); - err =sys_ioctl (fd, cmd, (unsigned long )&kifr); -set_fs (old_fs); - -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 sys_ioctl (fd, cmd, (unsigned long )uifr); -default : -return -EINVAL ; - }; -} - -static int siocdevprivate_ioctl (unsigned int fd,unsigned int cmd,unsigned long arg) -{ -struct ifreq __user *u_ifreq64; -struct ifreq32 __user *u_ifreq32 =compat_ptr (arg); -char tmp_buf[IFNAMSIZ ]; -void __user *data64; -u32 data32; - -if (copy_from_user (&tmp_buf[0 ], &(u_ifreq32->ifr_ifrn.ifrn_name[0 ]), -IFNAMSIZ )) -return -EFAULT ; -if (__get_user (data32, &u_ifreq32->ifr_ifru.ifru_data)) -return -EFAULT ; - data64 =compat_ptr (data32); - - u_ifreq64 =compat_alloc_user_space (sizeof (*u_ifreq64)); - -/* Don't check these user accesses, just let that get trapped -* in the ioctl handler instead. -*/ -if (copy_to_user (&u_ifreq64->ifr_ifrn.ifrn_name[0 ], &tmp_buf[0 ], -IFNAMSIZ )) -return -EFAULT ; -if (__put_user (data64, &u_ifreq64->ifr_ifru.ifru_data)) -return -EFAULT ; - -return sys_ioctl (fd, cmd, (unsigned long ) u_ifreq64); -} - -static int dev_ifsioc (unsigned int fd,unsigned int cmd,unsigned long arg) -{ -struct ifreq ifr; -struct ifreq32 __user *uifr32; -struct ifmap32 __user *uifmap32; -mm_segment_t old_fs; -int err; - - uifr32 =compat_ptr (arg); - uifmap32 = &uifr32->ifr_ifru.ifru_map; -switch (cmd) { -case SIOCSIFMAP : - err =copy_from_user (&ifr, uifr32,sizeof (ifr.ifr_name)); - err |=__get_user (ifr.ifr_map.mem_start, &uifmap32->mem_start); - err |=__get_user (ifr.ifr_map.mem_end, &uifmap32->mem_end); - err |=__get_user (ifr.ifr_map.base_addr, &uifmap32->base_addr); - err |=__get_user (ifr.ifr_map.irq, &uifmap32->irq); - err |=__get_user (ifr.ifr_map.dma, &uifmap32->dma); - err |=__get_user (ifr.ifr_map.port, &uifmap32->port); -if (err) -return -EFAULT ; -break ; -case SIOCSHWTSTAMP : -if (copy_from_user (&ifr, uifr32,sizeof (*uifr32))) -return -EFAULT ; - ifr.ifr_data =compat_ptr (uifr32->ifr_ifru.ifru_data); -break ; -default : -if (copy_from_user (&ifr, uifr32,sizeof (*uifr32))) -return -EFAULT ; -break ; - } - old_fs =get_fs (); -set_fs (KERNEL_DS ); - err =sys_ioctl (fd, cmd, (unsigned long )&ifr); -set_fs (old_fs); -if (!err) { -switch (cmd) { -case SIOCGIFFLAGS : -case SIOCGIFMETRIC : -case SIOCGIFMTU : -case SIOCGIFMEM : -case SIOCGIFHWADDR : -case SIOCGIFINDEX : -case SIOCGIFADDR : -case SIOCGIFBRDADDR : -case SIOCGIFDSTADDR : -case SIOCGIFNETMASK : -case SIOCGIFTXQLEN : -if (copy_to_user (uifr32, &ifr,sizeof (*uifr32))) -return -EFAULT ; -break ; -case SIOCGIFMAP : - err =copy_to_user (uifr32, &ifr,sizeof (ifr.ifr_name)); - err |=__put_user (ifr.ifr_map.mem_start, &uifmap32->mem_start); - err |=__put_user (ifr.ifr_map.mem_end, &uifmap32->mem_end); - err |=__put_user (ifr.ifr_map.base_addr, &uifmap32->base_addr); - err |=__put_user (ifr.ifr_map.irq, &uifmap32->irq); - err |=__put_user (ifr.ifr_map.dma, &uifmap32->dma); - err |=__put_user (ifr.ifr_map.port, &uifmap32->port); -if (err) - err = -EFAULT ; -break ; - } - } -return err; -} - -struct rtentry32 { -u32 rt_pad1; -struct sockaddr rt_dst;/* target address */ -struct sockaddr rt_gateway;/* gateway addr (RTF_GATEWAY) */ -struct sockaddr rt_genmask;/* target network mask (IP) */ -unsigned short rt_flags; -short rt_pad2; -u32 rt_pad3; -unsigned char rt_tos; -unsigned char rt_class; -short rt_pad4; -short rt_metric;/* +1 for binary compatibility! */ -/* char * */ u32 rt_dev;/* forcing the device at add */ -u32 rt_mtu;/* per route MTU/Window */ -u32 rt_window;/* Window clamping */ -unsigned short rt_irtt;/* Initial RTT */ - -}; - -struct in6_rtmsg32 { -struct in6_addr rtmsg_dst; -struct in6_addr rtmsg_src; -struct in6_addr rtmsg_gateway; -u32 rtmsg_type; -u16 rtmsg_dst_len; -u16 rtmsg_src_len; -u32 rtmsg_metric; -u32 rtmsg_info; -u32 rtmsg_flags; -s32 rtmsg_ifindex; -}; - -static int routing_ioctl (unsigned int fd,unsigned int cmd,unsigned long arg) -{ -int ret; -void *r =NULL ; -struct in6_rtmsg r6; -struct rtentry r4; -char devname[16 ]; -u32 rtdev; -mm_segment_t old_fs =get_fs (); - -struct socket *mysock =sockfd_lookup (fd, &ret); - -if (mysock && mysock->sk && mysock->sk->sk_family ==AF_INET6 ) {/* ipv6 */ -struct in6_rtmsg32 __user *ur6 =compat_ptr (arg); - ret =copy_from_user (&r6.rtmsg_dst, &(ur6->rtmsg_dst), -3 *sizeof (struct in6_addr )); - ret |=__get_user (r6.rtmsg_type, &(ur6->rtmsg_type)); - ret |=__get_user (r6.rtmsg_dst_len, &(ur6->rtmsg_dst_len)); - ret |=__get_user (r6.rtmsg_src_len, &(ur6->rtmsg_src_len)); - ret |=__get_user (r6.rtmsg_metric, &(ur6->rtmsg_metric)); - ret |=__get_user (r6.rtmsg_info, &(ur6->rtmsg_info)); - ret |=__get_user (r6.rtmsg_flags, &(ur6->rtmsg_flags)); - ret |=__get_user (r6.rtmsg_ifindex, &(ur6->rtmsg_ifindex)); - - r = (void *) &r6; - }else {/* ipv4 */ -struct rtentry32 __user *ur4 =compat_ptr (arg); - ret =copy_from_user (&r4.rt_dst, &(ur4->rt_dst), -3 *sizeof (struct sockaddr )); - ret |=__get_user (r4.rt_flags, &(ur4->rt_flags)); - ret |=__get_user (r4.rt_metric, &(ur4->rt_metric)); - ret |=__get_user (r4.rt_mtu, &(ur4->rt_mtu)); - ret |=__get_user (r4.rt_window, &(ur4->rt_window)); - ret |=__get_user (r4.rt_irtt, &(ur4->rt_irtt)); - ret |=__get_user (rtdev, &(ur4->rt_dev)); -if (rtdev) { - ret |=copy_from_user (devname,compat_ptr (rtdev),15 ); - r4.rt_dev = devname; devname[15 ] =0 ; - }else - r4.rt_dev =NULL ; - - r = (void *) &r4; - } - -if (ret) { - ret = -EFAULT ; - goto out; - } - -set_fs (KERNEL_DS ); - ret =sys_ioctl (fd, cmd, (unsigned long ) r); -set_fs (old_fs); - -out: -if (mysock) -sockfd_put (mysock); - -return ret; -} -#endif - #ifdef CONFIG_BLOCK typedef struct sg_io_hdr32 { compat_int_t interface_id; /* [i] 'S' for SCSI generic (required) */
@@ -1206,170 +790,6 @@ static int do_smb_getmountuid(unsigned int fd, unsigned int cmd, unsigned long areturn err; } -struct atmif_sioc32 { -compat_int_t number; -compat_int_t length; -compat_caddr_t arg; -}; - -struct atm_iobuf32 { -compat_int_t length; -compat_caddr_t buffer; -}; - -#define ATM_GETLINKRATE32 _IOW('a', ATMIOC_ITF+1, struct atmif_sioc32) -#define ATM_GETNAMES32 _IOW('a', ATMIOC_ITF+3, struct atm_iobuf32) -#define ATM_GETTYPE32 _IOW('a', ATMIOC_ITF+4, struct atmif_sioc32) -#define ATM_GETESI32 _IOW('a', ATMIOC_ITF+5, struct atmif_sioc32) -#define ATM_GETADDR32 _IOW('a', ATMIOC_ITF+6, struct atmif_sioc32) -#define ATM_RSTADDR32 _IOW('a', ATMIOC_ITF+7, struct atmif_sioc32) -#define ATM_ADDADDR32 _IOW('a', ATMIOC_ITF+8, struct atmif_sioc32) -#define ATM_DELADDR32 _IOW('a', ATMIOC_ITF+9, struct atmif_sioc32) -#define ATM_GETCIRANGE32 _IOW('a', ATMIOC_ITF+10, struct atmif_sioc32) -#define ATM_SETCIRANGE32 _IOW('a', ATMIOC_ITF+11, struct atmif_sioc32) -#define ATM_SETESI32 _IOW('a', ATMIOC_ITF+12, struct atmif_sioc32) -#define ATM_SETESIF32 _IOW('a', ATMIOC_ITF+13, struct atmif_sioc32) -#define ATM_GETSTAT32 _IOW('a', ATMIOC_SARCOM+0, struct atmif_sioc32) -#define ATM_GETSTATZ32 _IOW('a', ATMIOC_SARCOM+1, struct atmif_sioc32) -#define ATM_GETLOOP32 _IOW('a', ATMIOC_SARCOM+2, struct atmif_sioc32) -#define ATM_SETLOOP32 _IOW('a', ATMIOC_SARCOM+3, struct atmif_sioc32) -#define ATM_QUERYLOOP32 _IOW('a', ATMIOC_SARCOM+4, struct atmif_sioc32) - -static struct { -unsigned int cmd32; -unsigned int cmd; -} atm_ioctl_map[] = { - {ATM_GETLINKRATE32 ,ATM_GETLINKRATE }, - {ATM_GETNAMES32 ,ATM_GETNAMES }, - {ATM_GETTYPE32 ,ATM_GETTYPE }, - {ATM_GETESI32 ,ATM_GETESI }, - {ATM_GETADDR32 ,ATM_GETADDR }, - {ATM_RSTADDR32 ,ATM_RSTADDR }, - {ATM_ADDADDR32 ,ATM_ADDADDR }, - {ATM_DELADDR32 ,ATM_DELADDR }, - {ATM_GETCIRANGE32 ,ATM_GETCIRANGE }, - {ATM_SETCIRANGE32 ,ATM_SETCIRANGE }, - {ATM_SETESI32 ,ATM_SETESI }, - {ATM_SETESIF32 ,ATM_SETESIF }, - {ATM_GETSTAT32 ,ATM_GETSTAT }, - {ATM_GETSTATZ32 ,ATM_GETSTATZ }, - {ATM_GETLOOP32 ,ATM_GETLOOP }, - {ATM_SETLOOP32 ,ATM_SETLOOP }, - {ATM_QUERYLOOP32 ,ATM_QUERYLOOP } -}; - -#define NR_ATM_IOCTL ARRAY_SIZE(atm_ioctl_map) - -static int do_atm_iobuf (unsigned int fd,unsigned int cmd,unsigned long arg) -{ -struct atm_iobuf __user *iobuf; -struct atm_iobuf32 __user *iobuf32; -u32 data; -void __user *datap; -int len, err; - - iobuf =compat_alloc_user_space (sizeof (*iobuf)); - iobuf32 =compat_ptr (arg); - -if (get_user (len, &iobuf32->length) || -get_user (data, &iobuf32->buffer)) -return -EFAULT ; - datap =compat_ptr (data); -if (put_user (len, &iobuf->length) || -put_user (datap, &iobuf->buffer)) -return -EFAULT ; - - err =sys_ioctl (fd, cmd, (unsigned long )iobuf); - -if (!err) { -if (copy_in_user (&iobuf32->length, &iobuf->length, -sizeof (int ))) - err = -EFAULT ; - } - -return err; -} - -static int do_atmif_sioc (unsigned int fd,unsigned int cmd,unsigned long arg) -{ -struct atmif_sioc __user *sioc; -struct atmif_sioc32 __user *sioc32; -u32 data; -void __user *datap; -int err; - - sioc =compat_alloc_user_space (sizeof (*sioc)); - sioc32 =compat_ptr (arg); - -if (copy_in_user (&sioc->number, &sioc32->number,2 *sizeof (int )) || -get_user (data, &sioc32->arg)) -return -EFAULT ; - datap =compat_ptr (data); -if (put_user (datap, &sioc->arg)) -return -EFAULT ; - - err =sys_ioctl (fd, cmd, (unsigned long ) sioc); - -if (!err) { -if (copy_in_user (&sioc32->length, &sioc->length, -sizeof (int ))) - err = -EFAULT ; - } -return err; -} - -static int do_atm_ioctl (unsigned int fd,unsigned int cmd32,unsigned long arg) -{ -int i; -unsigned int cmd =0 ; - -switch (cmd32) { -case SONET_GETSTAT : -case SONET_GETSTATZ : -case SONET_GETDIAG : -case SONET_SETDIAG : -case SONET_CLRDIAG : -case SONET_SETFRAMING : -case SONET_GETFRAMING : -case SONET_GETFRSENSE : -return do_atmif_sioc (fd, cmd32, arg); - } - -for (i =0 ; i <NR_ATM_IOCTL ; i++) { -if (cmd32 == atm_ioctl_map[i].cmd32) { - cmd = atm_ioctl_map[i].cmd; -break ; - } - } -if (i ==NR_ATM_IOCTL ) -return -EINVAL ; - -switch (cmd) { -case ATM_GETNAMES : -return do_atm_iobuf (fd, cmd, arg); - -case ATM_GETLINKRATE : -case ATM_GETTYPE : -case ATM_GETESI : -case ATM_GETADDR : -case ATM_RSTADDR : -case ATM_ADDADDR : -case ATM_DELADDR : -case ATM_GETCIRANGE : -case ATM_SETCIRANGE : -case ATM_SETESI : -case ATM_SETESIF : -case ATM_GETSTAT : -case ATM_GETSTATZ : -case ATM_GETLOOP : -case ATM_SETLOOP : -case ATM_QUERYLOOP : -return do_atmif_sioc (fd, cmd, arg); - } - -return -EINVAL ; -} -static __used int ret_einval (unsigned int fd,unsigned int cmd,unsigned long arg) {
@@ -1712,21 +1132,6 @@ static int do_i2c_smbus_ioctl(unsigned int fd, unsigned int cmd, unsigned long areturn sys_ioctl (fd, cmd, (unsigned long )tdata); } -/* Since old style bridge ioctl's endup using SIOCDEVPRIVATE -* for some operations; this forces use of the newer bridge-utils that -* use compatible ioctls -*/ -static int old_bridge_ioctl (unsigned int fd,unsigned int cmd,unsigned long arg) -{ -u32 tmp; - -if (get_user (tmp, (u32 __user *) arg)) -return -EFAULT ; -if (tmp ==BRCTL_GET_VERSION ) -return BRCTL_VERSION +1 ; -return -EINVAL ; -} -#define RTC_IRQP_READ32 _IOR('p', 0x0b, compat_ulong_t)#define RTC_IRQP_SET32 _IOW('p', 0x0c, compat_ulong_t)#define RTC_EPOCH_READ32 _IOR('p', 0x0d, compat_ulong_t)
@@ -2014,28 +1419,6 @@ COMPATIBLE_IOCTL(_IOW('p', 21, int[7])) /* RTCSET */ COMPATIBLE_IOCTL(MTIOCTOP) /* Socket level stuff */ COMPATIBLE_IOCTL(FIOQSIZE) -COMPATIBLE_IOCTL(FIOSETOWN) -COMPATIBLE_IOCTL(SIOCSPGRP) -COMPATIBLE_IOCTL(FIOGETOWN) -COMPATIBLE_IOCTL(SIOCGPGRP) -COMPATIBLE_IOCTL(SIOCATMARK) -COMPATIBLE_IOCTL(SIOCSIFLINK) -COMPATIBLE_IOCTL(SIOCSIFNAME) -COMPATIBLE_IOCTL(SIOCSARP) -COMPATIBLE_IOCTL(SIOCGARP) -COMPATIBLE_IOCTL(SIOCDARP) -COMPATIBLE_IOCTL(SIOCSRARP) -COMPATIBLE_IOCTL(SIOCGRARP) -COMPATIBLE_IOCTL(SIOCDRARP) -COMPATIBLE_IOCTL(SIOCADDDLCI) -COMPATIBLE_IOCTL(SIOCDELDLCI) -COMPATIBLE_IOCTL(SIOCGMIIPHY) -COMPATIBLE_IOCTL(SIOCGMIIREG) -COMPATIBLE_IOCTL(SIOCSMIIREG) -COMPATIBLE_IOCTL(SIOCGIFVLAN) -COMPATIBLE_IOCTL(SIOCSIFVLAN) -COMPATIBLE_IOCTL(SIOCBRADDBR) -COMPATIBLE_IOCTL(SIOCBRDELBR) #ifdef CONFIG_BLOCK /* SG stuff */ COMPATIBLE_IOCTL(SG_SET_TIMEOUT)
@@ -2291,22 +1674,6 @@ COMPATIBLE_IOCTL(RAW_SETBIND) COMPATIBLE_IOCTL(RAW_GETBIND) /* SMB ioctls which do not need any translations */ COMPATIBLE_IOCTL(SMB_IOC_NEWCONN) -/* Little a */ -COMPATIBLE_IOCTL(ATMSIGD_CTRL) -COMPATIBLE_IOCTL(ATMARPD_CTRL) -COMPATIBLE_IOCTL(ATMLEC_CTRL) -COMPATIBLE_IOCTL(ATMLEC_MCAST) -COMPATIBLE_IOCTL(ATMLEC_DATA) -COMPATIBLE_IOCTL(ATM_SETSC) -COMPATIBLE_IOCTL(SIOCSIFATMTCP) -COMPATIBLE_IOCTL(SIOCMKCLIP) -COMPATIBLE_IOCTL(ATMARP_MKIP) -COMPATIBLE_IOCTL(ATMARP_SETENTRY) -COMPATIBLE_IOCTL(ATMARP_ENCAP) -COMPATIBLE_IOCTL(ATMTCP_CREATE) -COMPATIBLE_IOCTL(ATMTCP_REMOVE) -COMPATIBLE_IOCTL(ATMMPC_CTRL) -COMPATIBLE_IOCTL(ATMMPC_DATA) /* Watchdog */ COMPATIBLE_IOCTL(WDIOC_GETSUPPORT) COMPATIBLE_IOCTL(WDIOC_GETSTATUS)
@@ -2512,60 +1879,6 @@ COMPATIBLE_IOCTL(JSIOCGBUTTONS)COMPATIBLE_IOCTL (JSIOCGNAME (0 )) /* now things that need handlers */ -#ifdef CONFIG_NET -HANDLE_IOCTL(SIOCGIFNAME, dev_ifname32) -HANDLE_IOCTL(SIOCGIFCONF, dev_ifconf) -HANDLE_IOCTL(SIOCGIFFLAGS, dev_ifsioc) -HANDLE_IOCTL(SIOCSIFFLAGS, dev_ifsioc) -HANDLE_IOCTL(SIOCGIFMETRIC, dev_ifsioc) -HANDLE_IOCTL(SIOCSIFMETRIC, dev_ifsioc) -HANDLE_IOCTL(SIOCGIFMTU, dev_ifsioc) -HANDLE_IOCTL(SIOCSIFMTU, dev_ifsioc) -HANDLE_IOCTL(SIOCGIFMEM, dev_ifsioc) -HANDLE_IOCTL(SIOCSIFMEM, dev_ifsioc) -HANDLE_IOCTL(SIOCGIFHWADDR, dev_ifsioc) -HANDLE_IOCTL(SIOCSIFHWADDR, dev_ifsioc) -HANDLE_IOCTL(SIOCADDMULTI, dev_ifsioc) -HANDLE_IOCTL(SIOCDELMULTI, dev_ifsioc) -HANDLE_IOCTL(SIOCGIFINDEX, dev_ifsioc) -HANDLE_IOCTL(SIOCGIFMAP, dev_ifsioc) -HANDLE_IOCTL(SIOCSIFMAP, dev_ifsioc) -HANDLE_IOCTL(SIOCGIFADDR, dev_ifsioc) -HANDLE_IOCTL(SIOCSIFADDR, dev_ifsioc) -HANDLE_IOCTL(SIOCSIFHWBROADCAST, dev_ifsioc) -HANDLE_IOCTL (SIOCSHWTSTAMP , dev_ifsioc) - -/* ioctls used by appletalk ddp.c */ -HANDLE_IOCTL(SIOCDIFADDR, dev_ifsioc) -HANDLE_IOCTL(SIOCSARP, dev_ifsioc) -HANDLE_IOCTL(SIOCDARP, dev_ifsioc) - -HANDLE_IOCTL(SIOCGIFBRDADDR, dev_ifsioc) -HANDLE_IOCTL(SIOCSIFBRDADDR, dev_ifsioc) -HANDLE_IOCTL(SIOCGIFDSTADDR, dev_ifsioc) -HANDLE_IOCTL(SIOCSIFDSTADDR, dev_ifsioc) -HANDLE_IOCTL(SIOCGIFNETMASK, dev_ifsioc) -HANDLE_IOCTL(SIOCSIFNETMASK, dev_ifsioc) -HANDLE_IOCTL(SIOCSIFPFLAGS, dev_ifsioc) -HANDLE_IOCTL(SIOCGIFPFLAGS, dev_ifsioc) -HANDLE_IOCTL(SIOCGIFTXQLEN, dev_ifsioc) -HANDLE_IOCTL(SIOCSIFTXQLEN, dev_ifsioc) -HANDLE_IOCTL(SIOCETHTOOL, ethtool_ioctl) -HANDLE_IOCTL(SIOCBONDENSLAVE, bond_ioctl) -HANDLE_IOCTL(SIOCBONDRELEASE, bond_ioctl) -HANDLE_IOCTL(SIOCBONDSETHWADDR, bond_ioctl) -HANDLE_IOCTL(SIOCBONDSLAVEINFOQUERY, bond_ioctl) -HANDLE_IOCTL(SIOCBONDINFOQUERY, bond_ioctl) -HANDLE_IOCTL(SIOCBONDCHANGEACTIVE, bond_ioctl) -HANDLE_IOCTL(SIOCADDRT, routing_ioctl) -HANDLE_IOCTL(SIOCDELRT, routing_ioctl) -HANDLE_IOCTL(SIOCBRADDIF, dev_ifsioc) -HANDLE_IOCTL (SIOCBRDELIF , dev_ifsioc) -/* Note SIOCRTMSG is no longer, so this is safe and * the user would have seen just an -EINVAL anyways. */ -HANDLE_IOCTL(SIOCRTMSG, ret_einval) -HANDLE_IOCTL(SIOCGSTAMP, do_siocgstamp) -HANDLE_IOCTL(SIOCGSTAMPNS, do_siocgstampns) -#endif #ifdef CONFIG_BLOCK HANDLE_IOCTL(SG_IO,sg_ioctl_trans)HANDLE_IOCTL (SG_GET_REQUEST_TABLE , sg_grt_trans)
@@ -2590,31 +1903,6 @@ HANDLE_IOCTL(KDFONTOP, do_kdfontop_ioctl)/* One SMB ioctl needs translations. */ #define SMB_IOC_GETMOUNTUID_32 _IOR('u', 1, compat_uid_t)HANDLE_IOCTL (SMB_IOC_GETMOUNTUID_32 , do_smb_getmountuid) -HANDLE_IOCTL(ATM_GETLINKRATE32, do_atm_ioctl) -HANDLE_IOCTL(ATM_GETNAMES32, do_atm_ioctl) -HANDLE_IOCTL(ATM_GETTYPE32, do_atm_ioctl) -HANDLE_IOCTL(ATM_GETESI32, do_atm_ioctl) -HANDLE_IOCTL(ATM_GETADDR32, do_atm_ioctl) -HANDLE_IOCTL(ATM_RSTADDR32, do_atm_ioctl) -HANDLE_IOCTL(ATM_ADDADDR32, do_atm_ioctl) -HANDLE_IOCTL(ATM_DELADDR32, do_atm_ioctl) -HANDLE_IOCTL(ATM_GETCIRANGE32, do_atm_ioctl) -HANDLE_IOCTL(ATM_SETCIRANGE32, do_atm_ioctl) -HANDLE_IOCTL(ATM_SETESI32, do_atm_ioctl) -HANDLE_IOCTL(ATM_SETESIF32, do_atm_ioctl) -HANDLE_IOCTL(ATM_GETSTAT32, do_atm_ioctl) -HANDLE_IOCTL(ATM_GETSTATZ32, do_atm_ioctl) -HANDLE_IOCTL(ATM_GETLOOP32, do_atm_ioctl) -HANDLE_IOCTL(ATM_SETLOOP32, do_atm_ioctl) -HANDLE_IOCTL(ATM_QUERYLOOP32, do_atm_ioctl) -HANDLE_IOCTL(SONET_GETSTAT, do_atm_ioctl) -HANDLE_IOCTL(SONET_GETSTATZ, do_atm_ioctl) -HANDLE_IOCTL(SONET_GETDIAG, do_atm_ioctl) -HANDLE_IOCTL(SONET_SETDIAG, do_atm_ioctl) -HANDLE_IOCTL(SONET_CLRDIAG, do_atm_ioctl) -HANDLE_IOCTL(SONET_SETFRAMING, do_atm_ioctl) -HANDLE_IOCTL(SONET_GETFRAMING, do_atm_ioctl) -HANDLE_IOCTL (SONET_GETFRSENSE , do_atm_ioctl) /* block stuff */#ifdef CONFIG_BLOCK /* loop */
@@ -2649,11 +1937,7 @@ COMPATIBLE_IOCTL(USBDEVFS_IOCTL32) HANDLE_IOCTL(I2C_FUNCS, w_long) HANDLE_IOCTL(I2C_RDWR, do_i2c_rdwr_ioctl)HANDLE_IOCTL (I2C_SMBUS , do_i2c_smbus_ioctl) -/* bridge */ -HANDLE_IOCTL(SIOCSIFBR, old_bridge_ioctl) -HANDLE_IOCTL (SIOCGIFBR , old_bridge_ioctl) /* Not implemented in the native kernel */ -IGNORE_IOCTL(SIOCGIFCOUNT) HANDLE_IOCTL(RTC_IRQP_READ32, rtc_ioctl) HANDLE_IOCTL(RTC_IRQP_SET32, rtc_ioctl)HANDLE_IOCTL (RTC_EPOCH_READ32 , rtc_ioctl)
@@ -2808,12 +2092,6 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd, goto found_handler; } -#ifdef CONFIG_NET -if (S_ISSOCK (filp->f_path.dentry->d_inode->i_mode) && - cmd >=SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE +15 )) { - error =siocdevprivate_ioctl (fd, cmd, arg); - } else -#endif {static int count;
net/socket.c +243 -231
738 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH 7/7 net, compat_ioctl: handle more ioctls correctly
In reply to Arnd BergmannThe MII ioctls and SIOCSIFNAME need to go through ifsioc conversion, which they never did so far. Some others are not implemented in the native path, so we can just return -EINVAL directly.
Add IFSLAVE ioctls to the EINVAL list and move it to the end to optimize the code path for the common case.
--- net/socket.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-)
net/socket.c +17 -14
@@ -2911,11 +2911,6 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,return do_siocgstamp (net, sock, cmd, argp);case SIOCGSTAMPNS :return do_siocgstampns (net, sock, cmd, argp); -/* Note SIOCRTMSG is no longer, so this is safe and -* the user would have seen just an -EINVAL anyways. */ -case SIOCRTMSG : -case SIOCGIFCOUNT : -return -EINVAL ;case FIOSETOWN :case SIOCSPGRP :
@@ -2949,8 +2944,6 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,case SIOCSIFHWBROADCAST :case SIOCSHWTSTAMP :case SIOCDIFADDR : -/* case SIOCSARP: duplicate */ -/* case SIOCDARP: duplicate */ case SIOCGIFBRDADDR :case SIOCSIFBRDADDR :case SIOCGIFDSTADDR :
@@ -2963,7 +2956,12 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,case SIOCSIFTXQLEN :case SIOCBRADDIF :case SIOCBRDELIF : +case SIOCSIFNAME : +case SIOCGMIIPHY : +case SIOCGMIIREG : +case SIOCSMIIREG :return dev_ifsioc (net, sock, cmd, argp); +case ATM_GETLINKRATE32 :case ATM_GETNAMES32 :case ATM_GETTYPE32 :
@@ -3010,17 +3008,22 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,case SIOCSARP :case SIOCGARP :case SIOCDARP : -case SIOCATMARK : -case SIOCSIFLINK : -case SIOCSIFNAME : +return sock_do_ioctl (net, sock, cmd, arg); + } + +/* Prevent warning from compat_sys_ioctl, these always +* result in -EINVAL in the native case anyway. */ +switch (cmd) { +case SIOCRTMSG : +case SIOCGIFCOUNT :case SIOCSRARP :case SIOCGRARP :case SIOCDRARP : -case SIOCGMIIPHY : -case SIOCGMIIREG : -case SIOCSMIIREG : -return sock_do_ioctl (net, sock, cmd, arg); +case SIOCSIFLINK : +case SIOCGIFSLAVE : +case SIOCSIFSLAVE : +return -EINVAL ; }return -ENOIOCTLCMD ;
Signature · 1 line
1.6.3.3
David Miller
maintainerFrom: Arnd Bergmann <[email protected]>
Date: Fri, 6 Nov 2009 19:09:02 +0100
Quoted 5 lines
This cleans up some of the socket ioctl handling by moving it from
fs/compat_ioctl.ctonet/socket.c. The code is still untested, so this is an RFC for now. If you're happy with it, I'll do some testing to see if everything still works.
Quoted 8 lines
This series is a prerequisite for cleaning up the rest of
compat_ioctl.c, saving some 30kb of kernel memory in the end.The first four patches are probably worthwhile independently, because they fix some bugs in
compat_ioctlhandling. There is some obvious conflict with the ATM patch I sent independently today. That one should probably be worked out first.
This looks great, all applied. Please make the fixups recommended to you in the feedback as followon patches.
Also, I added the following cure after your patch series:
net: compat: No need to define IFHWADDRLEN and IFNAMSIZ twice.
It's defined colloqually in linux/if.h and linux/compat.h includes that.
--- include/linux/compat.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
include/linux/compat.h +0 -2
@@ -166,8 +166,6 @@ struct compat_ifmap { };struct compat_ifreq { -#define IFHWADDRLEN 6 -#define IFNAMSIZ 16union {char ifrn_name[IFNAMSIZ ];/* if name, e.g. "en0" */ } ifr_ifrn;
Signature · 1 line
1.6.5.2
Quoted 11 lines · David Miller
From: Arnd Bergmann <[email protected]>
Date: Fri, 6 Nov 2009 19:09:02 +0100Quoted 8 lines
This cleans up some of the socket ioctl handling by moving it from
fs/compat_ioctl.ctonet/socket.c. The code is still untested, so this is an RFC for now. If you're happy with it, I'll do some testing to see if everything still works.This series is a prerequisite for cleaning up the rest of
compat_ioctl.c, saving some 30kb of kernel memory in the end.
Quoted 8 lines
Quoted 5 lines
The first four patches are probably worthwhile independently, because they fix some bugs in
compat_ioctlhandling. There is some obvious conflict with the ATM patch I sent independently today. That one should probably be worked out first.This looks great, all applied. Please make the fixups recommended to you in the feedback as followon patches.
Thanks! Two patches follow.
Any opinion on how to proceed with the ATM stuff? From my point of view, I'm fine with having moved it out of fs/compat_ioctl.c, but it's still a bit silly to have two half-complete implementations.
Quoted 6 lines
Also, I added the following cure after your patch series:
net: compat: No need to define IFHWADDRLEN and IFNAMSIZ twice.
It's defined colloqually in
linux/if.handlinux/compat.hincludes that.
ok.
Arnd <><
PATCH 1/2 net, compat_ioctl: fix SIOCGMII ioctls
SIOCGMIIPHY and SIOCGMIIREG return data through ifreq, so it needs to be converted on the way out as well.
SIOCGIFPFLAGS is unused, but has the same problem in theory.
--- net/socket.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
net/socket.c +3 -0
@@ -2587,7 +2587,10 @@ static int dev_ifsioc(struct net *net, struct socket *sock,case SIOCGIFBRDADDR :case SIOCGIFDSTADDR :case SIOCGIFNETMASK : +case SIOCGIFPFLAGS :case SIOCGIFTXQLEN : +case SIOCGMIIPHY : +case SIOCGMIIREG :if (copy_to_user (uifr32, &ifr,sizeof (*uifr32)))return -EFAULT ;break ;
Signature · 1 line
1.6.3.3
Re: [PATCH 1/2] net, compat_ioctl: fix SIOCGMII ioctls
From: Arnd Bergmann <[email protected]>
Date: Sun, 8 Nov 2009 22:34:13 +0100
Quoted 6 lines
SIOCGMIIPHY and SIOCGMIIREG return data through ifreq, so it needs to be converted on the way out as well.
SIOCGIFPFLAGS is unused, but has the same problem in theory.
Signed-off-by Arnd Bergmann <[email protected]>
Applied.
PATCH 2/2 net/compat_ioctl: support SIOCWANDEV
In reply to Arnd BergmannThis 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.
---
Krzysztof, can you verify that this is really needed and that it does the right thing?
Daniel, I didn't want to add another patch just for the broken whitespace I copied, but since we needed another fix in this area...
--- include/linux/compat.h | 41 ++++++++++++++++++++++++----------------- net/socket.c | 23 +++++++++++++++++++++++ 2 files changed, 47 insertions(+), 17 deletions(-)
include/linux/compat.h +24 -17
@@ -165,25 +165,32 @@ 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" */ - } ifr_ifrn; -union { -struct sockaddr ifru_addr; -struct sockaddr ifru_dstaddr; -struct sockaddr ifru_broadaddr; -struct sockaddr ifru_netmask; -struct sockaddr ifru_hwaddr; -short ifru_flags; -compat_int_t ifru_ivalue; -compat_int_t ifru_mtu; -struct compat_ifmap ifru_map; -char ifru_slave[IFNAMSIZ ];/* Just fits the size */ +union { +char ifrn_name[IFNAMSIZ ];/* if name, e.g. "en0" */ + } ifr_ifrn; +union { +struct sockaddr ifru_addr; +struct sockaddr ifru_dstaddr; +struct sockaddr ifru_broadaddr; +struct sockaddr ifru_netmask; +struct sockaddr ifru_hwaddr; +short ifru_flags; +compat_int_t ifru_ivalue; +compat_int_t ifru_mtu; +struct compat_ifmap ifru_map; +char ifru_slave[IFNAMSIZ ];/* Just fits the size */ char ifru_newname[IFNAMSIZ ]; -compat_caddr_t ifru_data; -/* XXXX? ifru_settings should be here */ - } ifr_ifru; +compat_caddr_t ifru_data; +struct compat_if_settings ifru_settings; + } ifr_ifru; };struct compat_ifconf {
net/socket.c +23 -0
@@ -2468,6 +2468,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) {
@@ -2900,6 +2921,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 :
Signature · 1 line
1.6.3.3
Re: [PATCH 2/2] net/compat_ioctl: support SIOCWANDEV
From: Arnd Bergmann <[email protected]>
Date: Sun, 8 Nov 2009 22:39:24 +0100
Quoted 9 lines
This adds
compat_ioctlsupport for SIOCWANDEV, which has always been missing.The definition of struct
compat_ifreqwas missing anifru_settingsfields that is needed to support SIOCWANDEV, so add that and clean up the whitespace damage in the struct definition.Signed-off-by Arnd Bergmann <[email protected]>
Applied, thanks.
Re: [PATCH 2/2] net/compat_ioctl: support SIOCWANDEV
In reply to Arnd BergmannQuoted 2 lines · Arnd Bergmann
This adds
compat_ioctlsupport for SIOCWANDEV, which has always been missing.
It looks good, can't test at the moment.
Signature · 1 line
Krzysztof Halasa
David Miller
maintainerFrom: Arnd Bergmann <[email protected]>
Date: Sun, 8 Nov 2009 22:31:47 +0100
Quoted 3 lines
Any opinion on how to proceed with the ATM stuff? From my point of view, I'm fine with having moved it out of
fs/compat_ioctl.c, but it's still a bit silly to have two half-complete implementations.
I haven't looked at that stuff yes, you can be sure it's in my queue :-)