net: make get_net_ns return error if NET_NS is disabled
Subsystems (4)
PATCH v4 1/1 net: make get_net_ns return error if NET_NS is disabled
There is a panic in socket ioctl cmd SIOCGSKNS when NET_NS is not enabled. The reason is that nsfs tries to access ns->ops but the proc_ns_operations is not implemented in this case.
[7.670023] Unable to handle kernel NULL pointer dereference at virtual address 00000010 [7.670268] pgd = 32b54000 [7.670544] [00000010] *pgd=00000000 [7.671861] Internal error: Oops: 5 [#1] SMP ARM [7.672315] Modules linked in: [7.672918] CPU: 0 PID: 1 Comm: systemd Not tainted 5.13.0-rc3-00375-g6799d4f2da49 #16 [7.673309] Hardware name: Generic DT based system [7.673642] PC is at nsfs_evict+0x24/0x30 [7.674486] LR is at clear_inode+0x20/0x9c
The same to tun SIOCGSKNS command.
To fix this problem, we make get_net_ns() return -EINVAL when NET_NS is disabled. Meanwhile move it to right place net/core/net_namespace.c.
---
v4: rebase to net tree.
--- include/linux/socket.h | 2 -- include/net/net_namespace.h | 7 +++++++ net/core/net_namespace.c | 12 ++++++++++++ net/socket.c | 13 ------------- 4 files changed, 19 insertions(+), 15 deletions(-)
include/linux/socket.h +0 -2
@@ -438,6 +438,4 @@ extern int __sys_socketpair(int family, int type, int protocol, int __user *usockvec);extern int __sys_shutdown_sock (struct socket *sock,int how);extern int __sys_shutdown (int fd,int how); - -extern struct ns_common *get_net_ns (struct ns_common *ns);#endif /* _LINUX_SOCKET_H */
include/net/net_namespace.h +7 -0
@@ -184,6 +184,8 @@ struct net *copy_net_ns(unsigned long flags, struct user_namespace *user_ns,void net_ns_get_ownership (const struct net *net,kuid_t *uid,kgid_t *gid);void net_ns_barrier (void ); + +struct ns_common *get_net_ns (struct ns_common *ns);#else /* CONFIG_NET_NS */ #include <linux/sched.h> #include <linux/nsproxy.h>
@@ -203,6 +205,11 @@ static inline void net_ns_get_ownership(const struct net *net, }static inline void net_ns_barrier (void ) {} + +static inline struct ns_common *get_net_ns (struct ns_common *ns) +{ +return ERR_PTR (-EINVAL ); +}#endif /* CONFIG_NET_NS */
net/core/net_namespace.c +12 -0
@@ -641,6 +641,18 @@ void __put_net(struct net *net) }EXPORT_SYMBOL_GPL (__put_net); +/** +* get_net_ns - increment the refcount of the network namespace +* @ns: common namespace (net) +* +* Returns the net's common namespace. +*/ +struct ns_common *get_net_ns (struct ns_common *ns) +{ + return &get_net(container_of(ns, struct net, ns))->ns; +} +EXPORT_SYMBOL_GPL (get_net_ns); +struct net *get_net_ns_by_fd (int fd) {struct file *file;
net/socket.c +0 -13
@@ -1072,19 +1072,6 @@ static long sock_do_ioctl(struct net *net, struct socket *sock,* what to do with it - that's up to the protocol still. */ -/** -* get_net_ns - increment the refcount of the network namespace -* @ns: common namespace (net) -* -* Returns the net's common namespace. -*/ - -struct ns_common *get_net_ns (struct ns_common *ns) -{ - return &get_net(container_of(ns, struct net, ns))->ns; -} -EXPORT_SYMBOL_GPL (get_net_ns); -static long sock_ioctl (struct file *file,unsigned cmd,unsigned long arg) {struct socket *sock;
Signature · 1 line
2.30.2
Quoted 19 lines · Changbin Du
There is a panic in socket ioctl cmd SIOCGSKNS when
NET_NSis not enabled. The reason is that nsfs tries to accessns->opsbut theproc_ns_operationsis not implemented in this case.[7.670023] Unable to handle kernel NULL pointer dereference at virtual address 00000010 [7.670268] pgd = 32b54000 [7.670544] [00000010] *pgd=00000000 [7.671861] Internal error: Oops: 5 [#1] SMP ARM [7.672315] Modules linked in: [7.672918] CPU: 0 PID: 1 Comm: systemd Not tainted 5.13.0-rc3-00375-g6799d4f2da49 #16 [7.673309] Hardware name: Generic DT based system [7.673642] PC is at nsfs_evict+0x24/0x30 [7.674486] LR is at clear_inode+0x20/0x9cThe same to tun SIOCGSKNS command.
To fix this problem, we make
get_net_ns()return-EINVALwhenNET_NSis disabled. Meanwhile move it to right placenet/core/net_namespace.c.
Quoted 7 lines
Signed-off-by Changbin Du <[email protected]>Fixes c62cce2caee5 ("net: add an ioctl to get a socket network namespace")Cc Cong Wang <[email protected]>Cc Jakub Kicinski <[email protected]>Cc David Laight <[email protected]>Cc Christian Brauner <[email protected]>Suggested-by Jakub Kicinski <[email protected]>
Looks good,
David Miller
maintainerI applied an earlie5r version of this chsange already, so you will need to send relative fixups.
Thank you.
Quoted 4 lines · David Miller
I applied an earlie5r version of this chsange already, so you will need to send relative fixups.
That version is fine. This one just does a rebase.
Quoted 1 line
Thank you.
Signature · 2 lines
Cheers, Changbin Du