2008-02-08 20:18:24 +08:00
|
|
|
/*
|
|
|
|
* Pid namespaces
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* (C) 2007 Pavel Emelyanov <xemul@openvz.org>, OpenVZ, SWsoft Inc.
|
|
|
|
* (C) 2007 Sukadev Bhattiprolu <sukadev@us.ibm.com>, IBM
|
|
|
|
* Many thanks to Oleg Nesterov for comments and help
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/pid.h>
|
|
|
|
#include <linux/pid_namespace.h>
|
|
|
|
#include <linux/syscalls.h>
|
|
|
|
#include <linux/err.h>
|
2008-07-25 16:48:47 +08:00
|
|
|
#include <linux/acct.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2011-03-24 07:43:13 +08:00
|
|
|
#include <linux/proc_fs.h>
|
pidns: add reboot_pid_ns() to handle the reboot syscall
In the case of a child pid namespace, rebooting the system does not really
makes sense. When the pid namespace is used in conjunction with the other
namespaces in order to create a linux container, the reboot syscall leads
to some problems.
A container can reboot the host. That can be fixed by dropping the
sys_reboot capability but we are unable to correctly to poweroff/
halt/reboot a container and the container stays stuck at the shutdown time
with the container's init process waiting indefinitively.
After several attempts, no solution from userspace was found to reliabily
handle the shutdown from a container.
This patch propose to make the init process of the child pid namespace to
exit with a signal status set to : SIGINT if the child pid namespace
called "halt/poweroff" and SIGHUP if the child pid namespace called
"reboot". When the reboot syscall is called and we are not in the initial
pid namespace, we kill the pid namespace for "HALT", "POWEROFF",
"RESTART", and "RESTART2". Otherwise we return EINVAL.
Returning EINVAL is also an easy way to check if this feature is supported
by the kernel when invoking another 'reboot' option like CAD.
By this way the parent process of the child pid namespace knows if it
rebooted or not and can take the right decision.
Test case:
==========
#include <alloca.h>
#include <stdio.h>
#include <sched.h>
#include <unistd.h>
#include <signal.h>
#include <sys/reboot.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <linux/reboot.h>
static int do_reboot(void *arg)
{
int *cmd = arg;
if (reboot(*cmd))
printf("failed to reboot(%d): %m\n", *cmd);
}
int test_reboot(int cmd, int sig)
{
long stack_size = 4096;
void *stack = alloca(stack_size) + stack_size;
int status;
pid_t ret;
ret = clone(do_reboot, stack, CLONE_NEWPID | SIGCHLD, &cmd);
if (ret < 0) {
printf("failed to clone: %m\n");
return -1;
}
if (wait(&status) < 0) {
printf("unexpected wait error: %m\n");
return -1;
}
if (!WIFSIGNALED(status)) {
printf("child process exited but was not signaled\n");
return -1;
}
if (WTERMSIG(status) != sig) {
printf("signal termination is not the one expected\n");
return -1;
}
return 0;
}
int main(int argc, char *argv[])
{
int status;
status = test_reboot(LINUX_REBOOT_CMD_RESTART, SIGHUP);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_RESTART) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_RESTART2, SIGHUP);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_RESTART2) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_HALT, SIGINT);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_HALT) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_POWER_OFF, SIGINT);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_POWERR_OFF) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_CAD_ON, -1);
if (status >= 0) {
printf("reboot(LINUX_REBOOT_CMD_CAD_ON) should have failed\n");
return 1;
}
printf("reboot(LINUX_REBOOT_CMD_CAD_ON) has failed as expected\n");
return 0;
}
[akpm@linux-foundation.org: tweak and add comments]
[akpm@linux-foundation.org: checkpatch fixes]
Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Tested-by: Serge Hallyn <serge.hallyn@canonical.com>
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-03-29 05:42:51 +08:00
|
|
|
#include <linux/reboot.h>
|
2012-08-04 10:11:22 +08:00
|
|
|
#include <linux/export.h>
|
2008-02-08 20:18:24 +08:00
|
|
|
|
|
|
|
#define BITS_PER_PAGE (PAGE_SIZE*8)
|
|
|
|
|
|
|
|
struct pid_cache {
|
|
|
|
int nr_ids;
|
|
|
|
char name[16];
|
|
|
|
struct kmem_cache *cachep;
|
|
|
|
struct list_head list;
|
|
|
|
};
|
|
|
|
|
|
|
|
static LIST_HEAD(pid_caches_lh);
|
|
|
|
static DEFINE_MUTEX(pid_caches_mutex);
|
|
|
|
static struct kmem_cache *pid_ns_cachep;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* creates the kmem cache to allocate pids from.
|
|
|
|
* @nr_ids: the number of numerical ids this pid will have to carry
|
|
|
|
*/
|
|
|
|
|
|
|
|
static struct kmem_cache *create_pid_cachep(int nr_ids)
|
|
|
|
{
|
|
|
|
struct pid_cache *pcache;
|
|
|
|
struct kmem_cache *cachep;
|
|
|
|
|
|
|
|
mutex_lock(&pid_caches_mutex);
|
|
|
|
list_for_each_entry(pcache, &pid_caches_lh, list)
|
|
|
|
if (pcache->nr_ids == nr_ids)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
pcache = kmalloc(sizeof(struct pid_cache), GFP_KERNEL);
|
|
|
|
if (pcache == NULL)
|
|
|
|
goto err_alloc;
|
|
|
|
|
|
|
|
snprintf(pcache->name, sizeof(pcache->name), "pid_%d", nr_ids);
|
|
|
|
cachep = kmem_cache_create(pcache->name,
|
|
|
|
sizeof(struct pid) + (nr_ids - 1) * sizeof(struct upid),
|
|
|
|
0, SLAB_HWCACHE_ALIGN, NULL);
|
|
|
|
if (cachep == NULL)
|
|
|
|
goto err_cachep;
|
|
|
|
|
|
|
|
pcache->nr_ids = nr_ids;
|
|
|
|
pcache->cachep = cachep;
|
|
|
|
list_add(&pcache->list, &pid_caches_lh);
|
|
|
|
out:
|
|
|
|
mutex_unlock(&pid_caches_mutex);
|
|
|
|
return pcache->cachep;
|
|
|
|
|
|
|
|
err_cachep:
|
|
|
|
kfree(pcache);
|
|
|
|
err_alloc:
|
|
|
|
mutex_unlock(&pid_caches_mutex);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2009-06-18 07:27:52 +08:00
|
|
|
static struct pid_namespace *create_pid_namespace(struct pid_namespace *parent_pid_ns)
|
2008-02-08 20:18:24 +08:00
|
|
|
{
|
|
|
|
struct pid_namespace *ns;
|
2009-06-18 07:27:52 +08:00
|
|
|
unsigned int level = parent_pid_ns->level + 1;
|
2011-03-24 07:43:13 +08:00
|
|
|
int i, err = -ENOMEM;
|
2008-02-08 20:18:24 +08:00
|
|
|
|
2008-07-25 16:48:42 +08:00
|
|
|
ns = kmem_cache_zalloc(pid_ns_cachep, GFP_KERNEL);
|
2008-02-08 20:18:24 +08:00
|
|
|
if (ns == NULL)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
ns->pidmap[0].page = kzalloc(PAGE_SIZE, GFP_KERNEL);
|
|
|
|
if (!ns->pidmap[0].page)
|
|
|
|
goto out_free;
|
|
|
|
|
|
|
|
ns->pid_cachep = create_pid_cachep(level + 1);
|
|
|
|
if (ns->pid_cachep == NULL)
|
|
|
|
goto out_free_map;
|
|
|
|
|
|
|
|
kref_init(&ns->kref);
|
|
|
|
ns->level = level;
|
2009-06-18 07:27:52 +08:00
|
|
|
ns->parent = get_pid_ns(parent_pid_ns);
|
2008-02-08 20:18:24 +08:00
|
|
|
|
|
|
|
set_bit(0, ns->pidmap[0].page);
|
|
|
|
atomic_set(&ns->pidmap[0].nr_free, BITS_PER_PAGE - 1);
|
|
|
|
|
2008-07-25 16:48:42 +08:00
|
|
|
for (i = 1; i < PIDMAP_ENTRIES; i++)
|
2008-02-08 20:18:24 +08:00
|
|
|
atomic_set(&ns->pidmap[i].nr_free, BITS_PER_PAGE);
|
|
|
|
|
2011-03-24 07:43:13 +08:00
|
|
|
err = pid_ns_prepare_proc(ns);
|
|
|
|
if (err)
|
|
|
|
goto out_put_parent_pid_ns;
|
|
|
|
|
2008-02-08 20:18:24 +08:00
|
|
|
return ns;
|
|
|
|
|
2011-03-24 07:43:13 +08:00
|
|
|
out_put_parent_pid_ns:
|
|
|
|
put_pid_ns(parent_pid_ns);
|
2008-02-08 20:18:24 +08:00
|
|
|
out_free_map:
|
|
|
|
kfree(ns->pidmap[0].page);
|
|
|
|
out_free:
|
|
|
|
kmem_cache_free(pid_ns_cachep, ns);
|
|
|
|
out:
|
2011-03-24 07:43:13 +08:00
|
|
|
return ERR_PTR(err);
|
2008-02-08 20:18:24 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void destroy_pid_namespace(struct pid_namespace *ns)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < PIDMAP_ENTRIES; i++)
|
|
|
|
kfree(ns->pidmap[i].page);
|
|
|
|
kmem_cache_free(pid_ns_cachep, ns);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old_ns)
|
|
|
|
{
|
|
|
|
if (!(flags & CLONE_NEWPID))
|
2009-06-18 07:27:53 +08:00
|
|
|
return get_pid_ns(old_ns);
|
2009-09-24 06:57:22 +08:00
|
|
|
if (flags & (CLONE_THREAD|CLONE_PARENT))
|
2009-06-18 07:27:53 +08:00
|
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
return create_pid_namespace(old_ns);
|
2008-02-08 20:18:24 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void free_pid_ns(struct kref *kref)
|
|
|
|
{
|
|
|
|
struct pid_namespace *ns, *parent;
|
|
|
|
|
|
|
|
ns = container_of(kref, struct pid_namespace, kref);
|
|
|
|
|
|
|
|
parent = ns->parent;
|
|
|
|
destroy_pid_namespace(ns);
|
|
|
|
|
|
|
|
if (parent != NULL)
|
|
|
|
put_pid_ns(parent);
|
|
|
|
}
|
2012-08-04 10:11:22 +08:00
|
|
|
EXPORT_SYMBOL_GPL(free_pid_ns);
|
2008-02-08 20:18:24 +08:00
|
|
|
|
|
|
|
void zap_pid_ns_processes(struct pid_namespace *pid_ns)
|
|
|
|
{
|
|
|
|
int nr;
|
|
|
|
int rc;
|
2012-06-01 07:26:40 +08:00
|
|
|
struct task_struct *task, *me = current;
|
|
|
|
|
|
|
|
/* Ignore SIGCHLD causing any terminated children to autoreap */
|
|
|
|
spin_lock_irq(&me->sighand->siglock);
|
|
|
|
me->sighand->action[SIGCHLD - 1].sa.sa_handler = SIG_IGN;
|
|
|
|
spin_unlock_irq(&me->sighand->siglock);
|
2008-02-08 20:18:24 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The last thread in the cgroup-init thread group is terminating.
|
|
|
|
* Find remaining pid_ts in the namespace, signal and wait for them
|
|
|
|
* to exit.
|
|
|
|
*
|
|
|
|
* Note: This signals each threads in the namespace - even those that
|
|
|
|
* belong to the same thread group, To avoid this, we would have
|
|
|
|
* to walk the entire tasklist looking a processes in this
|
|
|
|
* namespace, but that could be unnecessarily expensive if the
|
|
|
|
* pid namespace has just a few processes. Or we need to
|
|
|
|
* maintain a tasklist for each pid namespace.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
read_lock(&tasklist_lock);
|
|
|
|
nr = next_pidmap(pid_ns, 1);
|
|
|
|
while (nr > 0) {
|
2009-04-03 07:58:06 +08:00
|
|
|
rcu_read_lock();
|
|
|
|
|
|
|
|
task = pid_task(find_vpid(nr), PIDTYPE_PID);
|
2012-03-24 06:02:46 +08:00
|
|
|
if (task && !__fatal_signal_pending(task))
|
|
|
|
send_sig_info(SIGKILL, SEND_SIG_FORCED, task);
|
2009-04-03 07:58:06 +08:00
|
|
|
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
2008-02-08 20:18:24 +08:00
|
|
|
nr = next_pidmap(pid_ns, nr);
|
|
|
|
}
|
|
|
|
read_unlock(&tasklist_lock);
|
|
|
|
|
2012-06-21 03:53:03 +08:00
|
|
|
/* Firstly reap the EXIT_ZOMBIE children we may have. */
|
2008-02-08 20:18:24 +08:00
|
|
|
do {
|
|
|
|
clear_thread_flag(TIF_SIGPENDING);
|
|
|
|
rc = sys_wait4(-1, NULL, __WALL, NULL);
|
|
|
|
} while (rc != -ECHILD);
|
|
|
|
|
2012-06-21 03:53:03 +08:00
|
|
|
/*
|
|
|
|
* sys_wait4() above can't reap the TASK_DEAD children.
|
|
|
|
* Make sure they all go away, see __unhash_process().
|
|
|
|
*/
|
|
|
|
for (;;) {
|
|
|
|
bool need_wait = false;
|
|
|
|
|
|
|
|
read_lock(&tasklist_lock);
|
|
|
|
if (!list_empty(¤t->children)) {
|
|
|
|
__set_current_state(TASK_UNINTERRUPTIBLE);
|
|
|
|
need_wait = true;
|
|
|
|
}
|
|
|
|
read_unlock(&tasklist_lock);
|
|
|
|
|
|
|
|
if (!need_wait)
|
|
|
|
break;
|
|
|
|
schedule();
|
|
|
|
}
|
|
|
|
|
pidns: add reboot_pid_ns() to handle the reboot syscall
In the case of a child pid namespace, rebooting the system does not really
makes sense. When the pid namespace is used in conjunction with the other
namespaces in order to create a linux container, the reboot syscall leads
to some problems.
A container can reboot the host. That can be fixed by dropping the
sys_reboot capability but we are unable to correctly to poweroff/
halt/reboot a container and the container stays stuck at the shutdown time
with the container's init process waiting indefinitively.
After several attempts, no solution from userspace was found to reliabily
handle the shutdown from a container.
This patch propose to make the init process of the child pid namespace to
exit with a signal status set to : SIGINT if the child pid namespace
called "halt/poweroff" and SIGHUP if the child pid namespace called
"reboot". When the reboot syscall is called and we are not in the initial
pid namespace, we kill the pid namespace for "HALT", "POWEROFF",
"RESTART", and "RESTART2". Otherwise we return EINVAL.
Returning EINVAL is also an easy way to check if this feature is supported
by the kernel when invoking another 'reboot' option like CAD.
By this way the parent process of the child pid namespace knows if it
rebooted or not and can take the right decision.
Test case:
==========
#include <alloca.h>
#include <stdio.h>
#include <sched.h>
#include <unistd.h>
#include <signal.h>
#include <sys/reboot.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <linux/reboot.h>
static int do_reboot(void *arg)
{
int *cmd = arg;
if (reboot(*cmd))
printf("failed to reboot(%d): %m\n", *cmd);
}
int test_reboot(int cmd, int sig)
{
long stack_size = 4096;
void *stack = alloca(stack_size) + stack_size;
int status;
pid_t ret;
ret = clone(do_reboot, stack, CLONE_NEWPID | SIGCHLD, &cmd);
if (ret < 0) {
printf("failed to clone: %m\n");
return -1;
}
if (wait(&status) < 0) {
printf("unexpected wait error: %m\n");
return -1;
}
if (!WIFSIGNALED(status)) {
printf("child process exited but was not signaled\n");
return -1;
}
if (WTERMSIG(status) != sig) {
printf("signal termination is not the one expected\n");
return -1;
}
return 0;
}
int main(int argc, char *argv[])
{
int status;
status = test_reboot(LINUX_REBOOT_CMD_RESTART, SIGHUP);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_RESTART) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_RESTART2, SIGHUP);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_RESTART2) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_HALT, SIGINT);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_HALT) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_POWER_OFF, SIGINT);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_POWERR_OFF) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_CAD_ON, -1);
if (status >= 0) {
printf("reboot(LINUX_REBOOT_CMD_CAD_ON) should have failed\n");
return 1;
}
printf("reboot(LINUX_REBOOT_CMD_CAD_ON) has failed as expected\n");
return 0;
}
[akpm@linux-foundation.org: tweak and add comments]
[akpm@linux-foundation.org: checkpatch fixes]
Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Tested-by: Serge Hallyn <serge.hallyn@canonical.com>
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-03-29 05:42:51 +08:00
|
|
|
if (pid_ns->reboot)
|
|
|
|
current->signal->group_exit_code = pid_ns->reboot;
|
|
|
|
|
2008-07-25 16:48:47 +08:00
|
|
|
acct_exit_ns(pid_ns);
|
2008-02-08 20:18:24 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-06-01 07:26:42 +08:00
|
|
|
#ifdef CONFIG_CHECKPOINT_RESTORE
|
2012-01-13 09:20:27 +08:00
|
|
|
static int pid_ns_ctl_handler(struct ctl_table *table, int write,
|
|
|
|
void __user *buffer, size_t *lenp, loff_t *ppos)
|
|
|
|
{
|
|
|
|
struct ctl_table tmp = *table;
|
|
|
|
|
|
|
|
if (write && !capable(CAP_SYS_ADMIN))
|
|
|
|
return -EPERM;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Writing directly to ns' last_pid field is OK, since this field
|
|
|
|
* is volatile in a living namespace anyway and a code writing to
|
|
|
|
* it should synchronize its usage with external means.
|
|
|
|
*/
|
|
|
|
|
|
|
|
tmp.data = ¤t->nsproxy->pid_ns->last_pid;
|
2012-09-18 05:09:12 +08:00
|
|
|
return proc_dointvec_minmax(&tmp, write, buffer, lenp, ppos);
|
2012-01-13 09:20:27 +08:00
|
|
|
}
|
|
|
|
|
2012-09-18 05:09:12 +08:00
|
|
|
extern int pid_max;
|
|
|
|
static int zero = 0;
|
2012-01-13 09:20:27 +08:00
|
|
|
static struct ctl_table pid_ns_ctl_table[] = {
|
|
|
|
{
|
|
|
|
.procname = "ns_last_pid",
|
|
|
|
.maxlen = sizeof(int),
|
|
|
|
.mode = 0666, /* permissions are checked in the handler */
|
|
|
|
.proc_handler = pid_ns_ctl_handler,
|
2012-09-18 05:09:12 +08:00
|
|
|
.extra1 = &zero,
|
|
|
|
.extra2 = &pid_max,
|
2012-01-13 09:20:27 +08:00
|
|
|
},
|
|
|
|
{ }
|
|
|
|
};
|
|
|
|
static struct ctl_path kern_path[] = { { .procname = "kernel", }, { } };
|
2012-06-01 07:26:42 +08:00
|
|
|
#endif /* CONFIG_CHECKPOINT_RESTORE */
|
2012-01-13 09:20:27 +08:00
|
|
|
|
pidns: add reboot_pid_ns() to handle the reboot syscall
In the case of a child pid namespace, rebooting the system does not really
makes sense. When the pid namespace is used in conjunction with the other
namespaces in order to create a linux container, the reboot syscall leads
to some problems.
A container can reboot the host. That can be fixed by dropping the
sys_reboot capability but we are unable to correctly to poweroff/
halt/reboot a container and the container stays stuck at the shutdown time
with the container's init process waiting indefinitively.
After several attempts, no solution from userspace was found to reliabily
handle the shutdown from a container.
This patch propose to make the init process of the child pid namespace to
exit with a signal status set to : SIGINT if the child pid namespace
called "halt/poweroff" and SIGHUP if the child pid namespace called
"reboot". When the reboot syscall is called and we are not in the initial
pid namespace, we kill the pid namespace for "HALT", "POWEROFF",
"RESTART", and "RESTART2". Otherwise we return EINVAL.
Returning EINVAL is also an easy way to check if this feature is supported
by the kernel when invoking another 'reboot' option like CAD.
By this way the parent process of the child pid namespace knows if it
rebooted or not and can take the right decision.
Test case:
==========
#include <alloca.h>
#include <stdio.h>
#include <sched.h>
#include <unistd.h>
#include <signal.h>
#include <sys/reboot.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <linux/reboot.h>
static int do_reboot(void *arg)
{
int *cmd = arg;
if (reboot(*cmd))
printf("failed to reboot(%d): %m\n", *cmd);
}
int test_reboot(int cmd, int sig)
{
long stack_size = 4096;
void *stack = alloca(stack_size) + stack_size;
int status;
pid_t ret;
ret = clone(do_reboot, stack, CLONE_NEWPID | SIGCHLD, &cmd);
if (ret < 0) {
printf("failed to clone: %m\n");
return -1;
}
if (wait(&status) < 0) {
printf("unexpected wait error: %m\n");
return -1;
}
if (!WIFSIGNALED(status)) {
printf("child process exited but was not signaled\n");
return -1;
}
if (WTERMSIG(status) != sig) {
printf("signal termination is not the one expected\n");
return -1;
}
return 0;
}
int main(int argc, char *argv[])
{
int status;
status = test_reboot(LINUX_REBOOT_CMD_RESTART, SIGHUP);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_RESTART) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_RESTART2, SIGHUP);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_RESTART2) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_HALT, SIGINT);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_HALT) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_POWER_OFF, SIGINT);
if (status < 0)
return 1;
printf("reboot(LINUX_REBOOT_CMD_POWERR_OFF) succeed\n");
status = test_reboot(LINUX_REBOOT_CMD_CAD_ON, -1);
if (status >= 0) {
printf("reboot(LINUX_REBOOT_CMD_CAD_ON) should have failed\n");
return 1;
}
printf("reboot(LINUX_REBOOT_CMD_CAD_ON) has failed as expected\n");
return 0;
}
[akpm@linux-foundation.org: tweak and add comments]
[akpm@linux-foundation.org: checkpatch fixes]
Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Tested-by: Serge Hallyn <serge.hallyn@canonical.com>
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-03-29 05:42:51 +08:00
|
|
|
int reboot_pid_ns(struct pid_namespace *pid_ns, int cmd)
|
|
|
|
{
|
|
|
|
if (pid_ns == &init_pid_ns)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case LINUX_REBOOT_CMD_RESTART2:
|
|
|
|
case LINUX_REBOOT_CMD_RESTART:
|
|
|
|
pid_ns->reboot = SIGHUP;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case LINUX_REBOOT_CMD_POWER_OFF:
|
|
|
|
case LINUX_REBOOT_CMD_HALT:
|
|
|
|
pid_ns->reboot = SIGINT;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
read_lock(&tasklist_lock);
|
|
|
|
force_sig(SIGKILL, pid_ns->child_reaper);
|
|
|
|
read_unlock(&tasklist_lock);
|
|
|
|
|
|
|
|
do_exit(0);
|
|
|
|
|
|
|
|
/* Not reached */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-02-08 20:18:24 +08:00
|
|
|
static __init int pid_namespaces_init(void)
|
|
|
|
{
|
|
|
|
pid_ns_cachep = KMEM_CACHE(pid_namespace, SLAB_PANIC);
|
2012-06-01 07:26:42 +08:00
|
|
|
|
|
|
|
#ifdef CONFIG_CHECKPOINT_RESTORE
|
2012-01-13 09:20:27 +08:00
|
|
|
register_sysctl_paths(kern_path, pid_ns_ctl_table);
|
2012-06-01 07:26:42 +08:00
|
|
|
#endif
|
2008-02-08 20:18:24 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
__initcall(pid_namespaces_init);
|