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>
130 lines
2.8 KiB
C
130 lines
2.8 KiB
C
#ifndef _LINUX_IPC_H
|
|
#define _LINUX_IPC_H
|
|
|
|
#include <linux/types.h>
|
|
|
|
#define IPC_PRIVATE ((__kernel_key_t) 0)
|
|
|
|
/* Obsolete, used only for backwards compatibility and libc5 compiles */
|
|
struct ipc_perm
|
|
{
|
|
__kernel_key_t key;
|
|
__kernel_uid_t uid;
|
|
__kernel_gid_t gid;
|
|
__kernel_uid_t cuid;
|
|
__kernel_gid_t cgid;
|
|
__kernel_mode_t mode;
|
|
unsigned short seq;
|
|
};
|
|
|
|
/* Include the definition of ipc64_perm */
|
|
#include <asm/ipcbuf.h>
|
|
|
|
/* resource get request flags */
|
|
#define IPC_CREAT 00001000 /* create if key is nonexistent */
|
|
#define IPC_EXCL 00002000 /* fail if key exists */
|
|
#define IPC_NOWAIT 00004000 /* return error on wait */
|
|
|
|
/* these fields are used by the DIPC package so the kernel as standard
|
|
should avoid using them if possible */
|
|
|
|
#define IPC_DIPC 00010000 /* make it distributed */
|
|
#define IPC_OWN 00020000 /* this machine is the DIPC owner */
|
|
|
|
/*
|
|
* Control commands used with semctl, msgctl and shmctl
|
|
* see also specific commands in sem.h, msg.h and shm.h
|
|
*/
|
|
#define IPC_RMID 0 /* remove resource */
|
|
#define IPC_SET 1 /* set ipc_perm options */
|
|
#define IPC_STAT 2 /* get ipc_perm options */
|
|
#define IPC_INFO 3 /* see ipcs */
|
|
|
|
/*
|
|
* Version flags for semctl, msgctl, and shmctl commands
|
|
* These are passed as bitflags or-ed with the actual command
|
|
*/
|
|
#define IPC_OLD 0 /* Old version (no 32-bit UID support on many
|
|
architectures) */
|
|
#define IPC_64 0x0100 /* New version (support 32-bit UIDs, bigger
|
|
message sizes, etc. */
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#include <linux/kref.h>
|
|
|
|
#define IPCMNI 32768 /* <= MAX_INT limit for ipc arrays (including sysctl changes) */
|
|
|
|
/* used by in-kernel data structures */
|
|
struct kern_ipc_perm
|
|
{
|
|
spinlock_t lock;
|
|
int deleted;
|
|
key_t key;
|
|
uid_t uid;
|
|
gid_t gid;
|
|
uid_t cuid;
|
|
gid_t cgid;
|
|
mode_t mode;
|
|
unsigned long seq;
|
|
void *security;
|
|
};
|
|
|
|
struct ipc_ids;
|
|
struct ipc_namespace {
|
|
struct kref kref;
|
|
struct ipc_ids *ids[3];
|
|
|
|
int sem_ctls[4];
|
|
int used_sems;
|
|
|
|
int msg_ctlmax;
|
|
int msg_ctlmnb;
|
|
int msg_ctlmni;
|
|
|
|
size_t shm_ctlmax;
|
|
size_t shm_ctlall;
|
|
int shm_ctlmni;
|
|
int shm_tot;
|
|
};
|
|
|
|
extern struct ipc_namespace init_ipc_ns;
|
|
|
|
#ifdef CONFIG_SYSVIPC
|
|
#define INIT_IPC_NS(ns) .ns = &init_ipc_ns,
|
|
extern struct ipc_namespace *copy_ipcs(unsigned long flags,
|
|
struct ipc_namespace *ns);
|
|
#else
|
|
#define INIT_IPC_NS(ns)
|
|
static inline struct ipc_namespace *copy_ipcs(unsigned long flags,
|
|
struct ipc_namespace *ns)
|
|
{
|
|
return ns;
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_IPC_NS
|
|
extern void free_ipc_ns(struct kref *kref);
|
|
#endif
|
|
|
|
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
|
|
{
|
|
#ifdef CONFIG_IPC_NS
|
|
if (ns)
|
|
kref_get(&ns->kref);
|
|
#endif
|
|
return ns;
|
|
}
|
|
|
|
static inline void put_ipc_ns(struct ipc_namespace *ns)
|
|
{
|
|
#ifdef CONFIG_IPC_NS
|
|
kref_put(&ns->kref, free_ipc_ns);
|
|
#endif
|
|
}
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _LINUX_IPC_H */
|
|
|
|
|