Messages in this thread Patch in this message | | | Date | Sun, 25 Mar 2007 11:16:47 -0500 | From | "Serge E. Hallyn" <> | Subject | Re: [PATCH] utsns: fix !CONFIG_UTS_NS behavior |
| |
Quoting Andrew Morton (akpm@linux-foundation.org): > On Fri, 23 Mar 2007 15:00:39 -0500 "Serge E. Hallyn" <serue@us.ibm.com> wrote: > > > When CONFIG_UTS_NS=n, clone(CLONE_NEWUTS) quietly refuses. So correctly does > > not unshare a new uts namespace, but also does not return -EINVAL. > > > > Fix this to return -EINVAL so the caller knows his request was denied. > > > > Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> > > > > --- > > > > include/linux/utsname.h | 2 ++ > > 1 files changed, 2 insertions(+), 0 deletions(-) > > > > bc350994ac67df8f1b917f9979c065d87757eabe > > diff --git a/include/linux/utsname.h b/include/linux/utsname.h > > index a4555fe..e10267d 100644 > > --- a/include/linux/utsname.h > > +++ b/include/linux/utsname.h > > @@ -70,6 +70,8 @@ static inline int unshare_utsname(unsign > > > > static inline int copy_utsname(int flags, struct task_struct *tsk) > > { > > + if (flags & CLONE_NEWUTS) > > + return -EINVAL; > > return 0; > > } > > static inline void put_uts_ns(struct uts_namespace *ns) > > I'm assuming that this is 2.6.21 material. > > Please review -mm's merge-sys_clone-sys_unshare-nsproxy-and-namespace.patch > - it probably needs to propagate this fix.
Yes it does. Here's a patch on top of 2.6.21-rc4-mm1. (or do you prefer I integrate it into merge-sys_clone-sys_unshare-nsproxy-and-namespace.patch itself?)
From: "Serge E. Hallyn" <serge@vino.hallyn.com> Subject: [PATCH] utsns [-mm]: fix !CONFIG_UTS_NS behavior
When CONFIG_UTS_NS=n, clone(CLONE_NEWUTS) quietly refuses. So correctly does not unshare a new uts namespace, but also does not return -EINVAL.
Fix this to return -EINVAL so the caller knows his request was denied.
Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
---
arch/s390/boot/image | Bin include/linux/utsname.h | 3 +++ 2 files changed, 3 insertions(+), 0 deletions(-)
8b4ffb8d88f89f118751f05869613ee16d5c463f diff --git a/arch/s390/boot/image b/arch/s390/boot/image index da5b91f..2bab55e 100755 Binary files a/arch/s390/boot/image and b/arch/s390/boot/image differ diff --git a/include/linux/utsname.h b/include/linux/utsname.h index 528a071..d63cdd8 100644 --- a/include/linux/utsname.h +++ b/include/linux/utsname.h @@ -35,6 +35,7 @@ struct new_utsname { #include <linux/sched.h> #include <linux/kref.h> #include <linux/nsproxy.h> +#include <linux/err.h> #include <asm/atomic.h> struct uts_namespace { @@ -60,6 +61,8 @@ static inline void put_uts_ns(struct uts static inline struct uts_namespace * copy_utsname(int flags, struct uts_namespace *ns) { + if (flags & CLONE_NEWUTS) + return ERR_PTR(-EINVAL); return ns; } static inline void put_uts_ns(struct uts_namespace *ns) -- 1.1.6 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |