| Message ID | 20180118193755.19997-10-viro@ZenIV.linux.org.uk |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [01/10] net: separate SIOCGIFCONF handling from dev_ioctl() | expand |
Looks fine,
Reviewed-by: Christoph Hellwig <hch@lst.de>
Al this series looks fine to me, want me to toss it into net-next?
On Wed, Jan 24, 2018 at 03:52:44PM -0500, David Miller wrote: > > Al this series looks fine to me, want me to toss it into net-next? Do you want them reposted (with updated commit messages), or would you prefer a pull request (with or without rebase to current tip of net-next)?
On Thu, Jan 25, 2018 at 12:01:25AM +0000, Al Viro wrote: > On Wed, Jan 24, 2018 at 03:52:44PM -0500, David Miller wrote: > > > > Al this series looks fine to me, want me to toss it into net-next? > > Do you want them reposted (with updated commit messages), or would > you prefer a pull request (with or without rebase to current tip > of net-next)? Below is a pull request for rebased branch. Patches themselves are identical to what had been posted, Reviewed-by added and commit message for "kill dev_ifsioc()" made more detailed. The following changes since commit be1b6e8b5470e8311bfa1a3dfd7bd59e85a99759: Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue (2018-01-24 18:02:17 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git rebased-net-ioctl for you to fetch changes up to 5c59e564e46dcbab2ee7a4e9e0243562a39679a2: kill kernel_sock_ioctl() (2018-01-24 19:13:45 -0500) ---------------------------------------------------------------- Al Viro (10): net: separate SIOCGIFCONF handling from dev_ioctl() devinet_ioctl(): take copyin/copyout to caller ip_rt_ioctl(): take copyin to caller kill dev_ifsioc() kill bond_ioctl() kill dev_ifname32() lift handling of SIOCIW... out of dev_ioctl() ipconfig: use dev_set_mtu() dev_ioctl(): move copyin/copyout to callers kill kernel_sock_ioctl() include/linux/inetdevice.h | 2 +- include/linux/net.h | 1 - include/linux/netdevice.h | 7 +- include/net/route.h | 2 +- include/net/wext.h | 4 +- net/core/dev_ioctl.c | 132 ++++++---------------- net/ipv4/af_inet.c | 28 ++++- net/ipv4/devinet.c | 57 ++++------ net/ipv4/fib_frontend.c | 8 +- net/ipv4/ipconfig.c | 47 ++------ net/socket.c | 271 ++++++++++++--------------------------------- net/wireless/wext-core.c | 13 ++- 12 files changed, 173 insertions(+), 399 deletions(-)
From: Al Viro <viro@ZenIV.linux.org.uk> Date: Thu, 25 Jan 2018 00:01:25 +0000 > On Wed, Jan 24, 2018 at 03:52:44PM -0500, David Miller wrote: >> >> Al this series looks fine to me, want me to toss it into net-next? > > Do you want them reposted (with updated commit messages), or would > you prefer a pull request (with or without rebase to current tip > of net-next)? A pull request works for me. Rebasing to net-next tip is pilot's discretion.
diff --git a/include/linux/net.h b/include/linux/net.h index caeb159abda5..68acc54976bf 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -306,7 +306,6 @@ int kernel_sendpage(struct socket *sock, struct page *page, int offset, size_t size, int flags); int kernel_sendpage_locked(struct sock *sk, struct page *page, int offset, size_t size, int flags); -int kernel_sock_ioctl(struct socket *sock, int cmd, unsigned long arg); int kernel_sock_shutdown(struct socket *sock, enum sock_shutdown_cmd how); /* Routine returns the IP overhead imposed by a (caller-protected) socket. */ diff --git a/net/socket.c b/net/socket.c index 982e9585fa31..3184573f58df 100644 --- a/net/socket.c +++ b/net/socket.c @@ -3254,19 +3254,6 @@ int kernel_sendpage_locked(struct sock *sk, struct page *page, int offset, } EXPORT_SYMBOL(kernel_sendpage_locked); -int kernel_sock_ioctl(struct socket *sock, int cmd, unsigned long arg) -{ - mm_segment_t oldfs = get_fs(); - int err; - - set_fs(KERNEL_DS); - err = sock->ops->ioctl(sock, cmd, arg); - set_fs(oldfs); - - return err; -} -EXPORT_SYMBOL(kernel_sock_ioctl); - int kernel_sock_shutdown(struct socket *sock, enum sock_shutdown_cmd how) { return sock->ops->shutdown(sock, how);