e3222c4ecc
sys_clone() and sys_unshare() both makes copies of nsproxy and its associated namespaces. But they have different code paths. This patch merges all the nsproxy and its associated namespace copy/clone handling (as much as possible). Posted on container list earlier for feedback. - Create a new nsproxy and its associated namespaces and pass it back to caller to attach it to right process. - Changed all copy_*_ns() routines to return a new copy of namespace instead of attaching it to task->nsproxy. - Moved the CAP_SYS_ADMIN checks out of copy_*_ns() routines. - Removed unnessary !ns checks from copy_*_ns() and added BUG_ON() just incase. - Get rid of all individual unshare_*_ns() routines and make use of copy_*_ns() instead. [akpm@osdl.org: cleanups, warning fix] [clg@fr.ibm.com: remove dup_namespaces() declaration] [serue@us.ibm.com: fix CONFIG_IPC_NS=n, clone(CLONE_NEWIPC) retval] [akpm@linux-foundation.org: fix build with CONFIG_SYSVIPC=n] Signed-off-by: Badari Pulavarty <pbadari@us.ibm.com> Signed-off-by: Serge Hallyn <serue@us.ibm.com> Cc: Cedric Le Goater <clg@fr.ibm.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: <containers@lists.osdl.org> Signed-off-by: Cedric Le Goater <clg@fr.ibm.com> Cc: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
85 lines
1.5 KiB
C
85 lines
1.5 KiB
C
#ifndef _LINUX_UTSNAME_H
|
|
#define _LINUX_UTSNAME_H
|
|
|
|
#define __OLD_UTS_LEN 8
|
|
|
|
struct oldold_utsname {
|
|
char sysname[9];
|
|
char nodename[9];
|
|
char release[9];
|
|
char version[9];
|
|
char machine[9];
|
|
};
|
|
|
|
#define __NEW_UTS_LEN 64
|
|
|
|
struct old_utsname {
|
|
char sysname[65];
|
|
char nodename[65];
|
|
char release[65];
|
|
char version[65];
|
|
char machine[65];
|
|
};
|
|
|
|
struct new_utsname {
|
|
char sysname[65];
|
|
char nodename[65];
|
|
char release[65];
|
|
char version[65];
|
|
char machine[65];
|
|
char domainname[65];
|
|
};
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#include <linux/sched.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/nsproxy.h>
|
|
#include <asm/atomic.h>
|
|
|
|
struct uts_namespace {
|
|
struct kref kref;
|
|
struct new_utsname name;
|
|
};
|
|
extern struct uts_namespace init_uts_ns;
|
|
|
|
static inline void get_uts_ns(struct uts_namespace *ns)
|
|
{
|
|
kref_get(&ns->kref);
|
|
}
|
|
|
|
#ifdef CONFIG_UTS_NS
|
|
extern struct uts_namespace *copy_utsname(int flags, struct uts_namespace *ns);
|
|
extern void free_uts_ns(struct kref *kref);
|
|
|
|
static inline void put_uts_ns(struct uts_namespace *ns)
|
|
{
|
|
kref_put(&ns->kref, free_uts_ns);
|
|
}
|
|
#else
|
|
static inline struct uts_namespace *copy_utsname(int flags,
|
|
struct uts_namespace *ns)
|
|
{
|
|
return ns;
|
|
}
|
|
|
|
static inline void put_uts_ns(struct uts_namespace *ns)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
static inline struct new_utsname *utsname(void)
|
|
{
|
|
return ¤t->nsproxy->uts_ns->name;
|
|
}
|
|
|
|
static inline struct new_utsname *init_utsname(void)
|
|
{
|
|
return &init_uts_ns.name;
|
|
}
|
|
|
|
extern struct rw_semaphore uts_sem;
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _LINUX_UTSNAME_H */
|