[PATCH] ipcns: fix !CONFIG_IPC_NS behavior
When CONFIG_IPC_NS=n, clone(CLONE_NEWIPC) claims success, but did not actually clone a new IPC namespace. Fix this to return -EINVAL so the caller knows his request was denied. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
d1985ad1da
Коммит
a28d193cbf
|
@ -92,19 +92,16 @@ extern struct ipc_namespace init_ipc_ns;
|
||||||
|
|
||||||
#ifdef CONFIG_SYSVIPC
|
#ifdef CONFIG_SYSVIPC
|
||||||
#define INIT_IPC_NS(ns) .ns = &init_ipc_ns,
|
#define INIT_IPC_NS(ns) .ns = &init_ipc_ns,
|
||||||
|
extern int copy_ipcs(unsigned long flags, struct task_struct *tsk);
|
||||||
#else
|
#else
|
||||||
#define INIT_IPC_NS(ns)
|
#define INIT_IPC_NS(ns)
|
||||||
|
static inline int copy_ipcs(unsigned long flags, struct task_struct *tsk)
|
||||||
|
{ return 0; }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_IPC_NS
|
#ifdef CONFIG_IPC_NS
|
||||||
extern void free_ipc_ns(struct kref *kref);
|
extern void free_ipc_ns(struct kref *kref);
|
||||||
extern int copy_ipcs(unsigned long flags, struct task_struct *tsk);
|
|
||||||
extern int unshare_ipcs(unsigned long flags, struct ipc_namespace **ns);
|
extern int unshare_ipcs(unsigned long flags, struct ipc_namespace **ns);
|
||||||
#else
|
|
||||||
static inline int copy_ipcs(unsigned long flags, struct task_struct *tsk)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
|
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
|
||||||
|
|
|
@ -144,6 +144,13 @@ void free_ipc_ns(struct kref *kref)
|
||||||
shm_exit_ns(ns);
|
shm_exit_ns(ns);
|
||||||
kfree(ns);
|
kfree(ns);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
int copy_ipcs(unsigned long flags, struct task_struct *tsk)
|
||||||
|
{
|
||||||
|
if (flags & CLONE_NEWIPC)
|
||||||
|
return -EINVAL;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Загрузка…
Ссылка в новой задаче