nsproxy - refactor setns()
RFC PATCH 1/8 nsproxy - refactor setns()
For usermode helpers to execute within a namspace a slightly different entry point to setns() that takes a namspace inode is needed.
--- include/linux/nsproxy.h | 1 + kernel/nsproxy.c | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-)
include/linux/nsproxy.h +1 -0
@@ -62,6 +62,7 @@ extern struct nsproxy init_nsproxy;* */ +int setns_inode (struct inode *inode,int nstype);int copy_namespaces (unsigned long flags,struct task_struct *tsk);void exit_task_namespaces (struct task_struct *tsk);void switch_task_namespaces (struct task_struct *tsk,struct nsproxy *new);
kernel/nsproxy.c +14 -7
@@ -218,20 +218,15 @@ void exit_task_namespaces(struct task_struct *p)switch_task_namespaces (p,NULL ); } -SYSCALL_DEFINE2(setns, int, fd, int, nstype) +int setns_inode (struct inode *inode,int nstype) {struct task_struct *tsk = current;struct nsproxy *new_nsproxy; -struct file *file;struct ns_common *ns;int err; - file =proc_ns_fget (fd); -if (IS_ERR (file)) -return PTR_ERR (file); - err = -EINVAL ; - ns =get_proc_ns (file_inode (file)); + ns =get_proc_ns (inode);if (nstype && (ns->ops->type != nstype)) goto out;
@@ -248,6 +243,18 @@ SYSCALL_DEFINE2(setns, int, fd, int, nstype) }switch_task_namespaces (tsk, new_nsproxy); out: +return err; +} + +SYSCALL_DEFINE2(setns, int, fd, int, nstype) +{ +struct file *file; +int err; + + file =proc_ns_fget (fd); +if (IS_ERR (file)) +return PTR_ERR (file); + err =setns_inode (file_inode (file), nstype);fput (file);return err; }
RFC PATCH 2/8 kmod - rename call_usermodehelper() flags parameter
The wait parameter of call_usermodehelper() is not quite a parameter that describes the wait behaviour alone and will later be used to request exec within a namespace.
So change its name to flags.
--- include/linux/kmod.h | 4 ++-- kernel/kmod.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-)
include/linux/kmod.h +2 -2
@@ -67,7 +67,7 @@ struct subprocess_info { };extern int -call_usermodehelper (char *path,char **argv,char **envp,int wait); +call_usermodehelper (char *path,char **argv,char **envp,int flags);extern struct subprocess_info * call_usermodehelper_setup(char *path, char **argv, char **envp, gfp_t gfp_mask,
@@ -75,7 +75,7 @@ call_usermodehelper_setup(char *path, char **argv, char **envp, gfp_t gfp_mask, void (*cleanup)(struct subprocess_info *), void *data);extern int -call_usermodehelper_exec (struct subprocess_info *info,int wait); +call_usermodehelper_exec (struct subprocess_info *info,int flags);extern struct ctl_table usermodehelper_table[];
kernel/kmod.c +8 -8
@@ -534,7 +534,7 @@ EXPORT_SYMBOL(call_usermodehelper_setup);* asynchronously if wait is not set, and runs as a child of keventd. * (ie. it runs with full root capabilities). */ -int call_usermodehelper_exec (struct subprocess_info *sub_info,int wait) +int call_usermodehelper_exec (struct subprocess_info *sub_info,int flags) {DECLARE_COMPLETION_ONSTACK (done);int retval =0 ;
@@ -553,14 +553,14 @@ int call_usermodehelper_exec(struct subprocess_info *sub_info, int wait)* This makes it possible to use umh_complete to free * the data structure in case of UMH_NO_WAIT. */ - sub_info->complete = (wait ==UMH_NO_WAIT ) ?NULL : &done; - sub_info->wait = wait; + sub_info->complete = (flags ==UMH_NO_WAIT ) ?NULL : &done; + sub_info->wait = flags;queue_work (khelper_wq, &sub_info->work); -if (wait ==UMH_NO_WAIT )/* task has freed sub_info */ +if (flags ==UMH_NO_WAIT )/* task has freed sub_info */ goto unlock; -if (wait &UMH_KILLABLE ) { +if (flags &UMH_KILLABLE ) { retval =wait_for_completion_killable (&done);if (!retval) goto wait_done;
@@ -595,17 +595,17 @@ EXPORT_SYMBOL(call_usermodehelper_exec);* This function is the equivalent to use call_usermodehelper_setup() and * call_usermodehelper_exec(). */ -int call_usermodehelper (char *path,char **argv,char **envp,int wait) +int call_usermodehelper (char *path,char **argv,char **envp,int flags) {struct subprocess_info *info; -gfp_t gfp_mask = (wait ==UMH_NO_WAIT ) ?GFP_ATOMIC :GFP_KERNEL ; +gfp_t gfp_mask = (flags ==UMH_NO_WAIT ) ?GFP_ATOMIC :GFP_KERNEL ; info =call_usermodehelper_setup (path, argv, envp, gfp_mask,NULL ,NULL ,NULL );if (info ==NULL )return -ENOMEM ; -return call_usermodehelper_exec (info, wait); +return call_usermodehelper_exec (info, flags); }EXPORT_SYMBOL (call_usermodehelper);
Oops!
Please ignore these, mistakenly sent.
Quoted 81 lines · Ian Kent
For usermode helpers to execute within a namspace a slightly different entry point to
setns()that takes a namspace inode is needed.Signed-off-by Ian Kent <[email protected]>Cc Benjamin Coddington <[email protected]>Cc Al Viro <[email protected]>Cc J. Bruce Fields <[email protected]>Cc David Howells <[email protected]>Cc Trond Myklebust <[email protected]>Cc Oleg Nesterov <[email protected]>Cc Eric W. Biederman <[email protected]>Cc Jeff Layton <[email protected]>--- include/linux/nsproxy.h | 1 + kernel/nsproxy.c | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-)include/linux/nsproxy.h +1
-0@@ -62,6 +62,7 @@ extern struct nsproxy init_nsproxy;* */ +int setns_inode (struct inode *inode,int nstype);int copy_namespaces (unsigned long flags,struct task_struct *tsk);void exit_task_namespaces (struct task_struct *tsk);void switch_task_namespaces (struct task_struct *tsk,struct nsproxy *new);kernel/nsproxy.c +14
-8@@ -218,20 +218,15 @@ void exit_task_namespaces(struct task_struct *p)switch_task_namespaces (p,NULL ); } -SYSCALL_DEFINE2(setns, int, fd, int, nstype) +int setns_inode (struct inode *inode,int nstype) {struct task_struct *tsk = current;struct nsproxy *new_nsproxy; -struct file *file;struct ns_common *ns;int err; - file =proc_ns_fget (fd); -if (IS_ERR (file)) -return PTR_ERR (file); - err = -EINVAL ; - ns =get_proc_ns (file_inode (file)); + ns =get_proc_ns (inode);if (nstype && (ns->ops->type != nstype)) goto out;@@ -248,6 +243,18 @@ SYSCALL_DEFINE2(setns, int, fd, int, nstype) }switch_task_namespaces (tsk, new_nsproxy); out: +return err; +} + +SYSCALL_DEFINE2(setns, int, fd, int, nstype) +{ +struct file *file; +int err; + + file =proc_ns_fget (fd); +if (IS_ERR (file)) +return PTR_ERR (file); + err =setns_inode (file_inode (file), nstype);fput (file);return err; } --To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/