* [PATCH] kernel: allow reboots from user_ns
@ 2013-02-14 11:56 Glauber Costa
2013-02-14 12:08 ` Daniel Lezcano
2013-02-14 14:27 ` Serge Hallyn
0 siblings, 2 replies; 6+ messages in thread
From: Glauber Costa @ 2013-02-14 11:56 UTC (permalink / raw)
To: linux-kernel; +Cc: containers, Glauber Costa, Eric W. Biederman, Andrew Morton
Reboot support for pid namespaces is already implemented and it works
well. However, in most containers the tasks will join all namespaces,
including the now supported user namespace. In that situation, we will
fail the "capable" test and won't be able to reboot.
The proposed solution is to allow reboots for CAP_SYS_BOOT processes
in the user namespace that owns the pid namespace.
Signed-off-by: Glauber Costa <glommer@parallels.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
---
kernel/sys.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/kernel/sys.c b/kernel/sys.c
index 265b376..3b0958e 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -435,9 +435,10 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
{
char buffer[256];
int ret = 0;
+ struct pid_namespace *curr_pidns = task_active_pid_ns(current);
/* We only trust the superuser with rebooting the system. */
- if (!capable(CAP_SYS_BOOT))
+ if (!ns_capable(curr_pidns->user_ns, CAP_SYS_BOOT))
return -EPERM;
/* For safety, we require "magic" arguments. */
@@ -453,7 +454,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
* pid_namespace, the command is handled by reboot_pid_ns() which will
* call do_exit().
*/
- ret = reboot_pid_ns(task_active_pid_ns(current), cmd);
+ ret = reboot_pid_ns(curr_pidns, cmd);
if (ret)
return ret;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] kernel: allow reboots from user_ns
2013-02-14 11:56 [PATCH] kernel: allow reboots from user_ns Glauber Costa
@ 2013-02-14 12:08 ` Daniel Lezcano
2013-02-14 14:27 ` Serge Hallyn
1 sibling, 0 replies; 6+ messages in thread
From: Daniel Lezcano @ 2013-02-14 12:08 UTC (permalink / raw)
To: Glauber Costa; +Cc: linux-kernel, containers, Eric W. Biederman, Andrew Morton
On 02/14/2013 12:56 PM, Glauber Costa wrote:
> Reboot support for pid namespaces is already implemented and it works
> well. However, in most containers the tasks will join all namespaces,
> including the now supported user namespace. In that situation, we will
> fail the "capable" test and won't be able to reboot.
>
> The proposed solution is to allow reboots for CAP_SYS_BOOT processes
> in the user namespace that owns the pid namespace.
>
> Signed-off-by: Glauber Costa <glommer@parallels.com>
> Cc: Eric W. Biederman <ebiederm@xmission.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> ---
Acked-by: Daniel Lezcano <daniel.lezcano@free.fr>
> kernel/sys.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/sys.c b/kernel/sys.c
> index 265b376..3b0958e 100644
> --- a/kernel/sys.c
> +++ b/kernel/sys.c
> @@ -435,9 +435,10 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
> {
> char buffer[256];
> int ret = 0;
> + struct pid_namespace *curr_pidns = task_active_pid_ns(current);
>
> /* We only trust the superuser with rebooting the system. */
> - if (!capable(CAP_SYS_BOOT))
> + if (!ns_capable(curr_pidns->user_ns, CAP_SYS_BOOT))
> return -EPERM;
>
> /* For safety, we require "magic" arguments. */
> @@ -453,7 +454,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
> * pid_namespace, the command is handled by reboot_pid_ns() which will
> * call do_exit().
> */
> - ret = reboot_pid_ns(task_active_pid_ns(current), cmd);
> + ret = reboot_pid_ns(curr_pidns, cmd);
> if (ret)
> return ret;
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] kernel: allow reboots from user_ns
2013-02-14 11:56 [PATCH] kernel: allow reboots from user_ns Glauber Costa
2013-02-14 12:08 ` Daniel Lezcano
@ 2013-02-14 14:27 ` Serge Hallyn
2013-02-14 14:30 ` Glauber Costa
1 sibling, 1 reply; 6+ messages in thread
From: Serge Hallyn @ 2013-02-14 14:27 UTC (permalink / raw)
To: Glauber Costa; +Cc: linux-kernel, containers, Eric W. Biederman, Andrew Morton
Quoting Glauber Costa (glommer@parallels.com):
> Reboot support for pid namespaces is already implemented and it works
> well. However, in most containers the tasks will join all namespaces,
> including the now supported user namespace. In that situation, we will
> fail the "capable" test and won't be able to reboot.
>
> The proposed solution is to allow reboots for CAP_SYS_BOOT processes
> in the user namespace that owns the pid namespace.
>
> Signed-off-by: Glauber Costa <glommer@parallels.com>
Note Li Zefan sent this identical patch last year. It's in my own
built userns kernel, and definately required :)
In any case,
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
> Cc: Eric W. Biederman <ebiederm@xmission.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> ---
> kernel/sys.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/sys.c b/kernel/sys.c
> index 265b376..3b0958e 100644
> --- a/kernel/sys.c
> +++ b/kernel/sys.c
> @@ -435,9 +435,10 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
> {
> char buffer[256];
> int ret = 0;
> + struct pid_namespace *curr_pidns = task_active_pid_ns(current);
>
> /* We only trust the superuser with rebooting the system. */
> - if (!capable(CAP_SYS_BOOT))
> + if (!ns_capable(curr_pidns->user_ns, CAP_SYS_BOOT))
> return -EPERM;
>
> /* For safety, we require "magic" arguments. */
> @@ -453,7 +454,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
> * pid_namespace, the command is handled by reboot_pid_ns() which will
> * call do_exit().
> */
> - ret = reboot_pid_ns(task_active_pid_ns(current), cmd);
> + ret = reboot_pid_ns(curr_pidns, cmd);
> if (ret)
> return ret;
>
> --
> 1.8.1.2
>
> _______________________________________________
> Containers mailing list
> Containers@lists.linux-foundation.org
> https://lists.linuxfoundation.org/mailman/listinfo/containers
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] kernel: allow reboots from user_ns
2013-02-14 14:27 ` Serge Hallyn
@ 2013-02-14 14:30 ` Glauber Costa
2013-02-14 14:58 ` Eric W. Biederman
0 siblings, 1 reply; 6+ messages in thread
From: Glauber Costa @ 2013-02-14 14:30 UTC (permalink / raw)
To: Serge Hallyn; +Cc: linux-kernel, containers, Eric W. Biederman, Andrew Morton
On 02/14/2013 06:27 PM, Serge Hallyn wrote:
> Quoting Glauber Costa (glommer@parallels.com):
>> Reboot support for pid namespaces is already implemented and it works
>> well. However, in most containers the tasks will join all namespaces,
>> including the now supported user namespace. In that situation, we will
>> fail the "capable" test and won't be able to reboot.
>>
>> The proposed solution is to allow reboots for CAP_SYS_BOOT processes
>> in the user namespace that owns the pid namespace.
>>
>> Signed-off-by: Glauber Costa <glommer@parallels.com>
>
> Note Li Zefan sent this identical patch last year. It's in my own
> built userns kernel, and definately required :)
>
I didn't see that, and using Linus' master my stop container scripts
stopped working after I started using Eric's userns...
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] kernel: allow reboots from user_ns
2013-02-14 14:30 ` Glauber Costa
@ 2013-02-14 14:58 ` Eric W. Biederman
2013-02-15 7:00 ` Glauber Costa
0 siblings, 1 reply; 6+ messages in thread
From: Eric W. Biederman @ 2013-02-14 14:58 UTC (permalink / raw)
To: Glauber Costa; +Cc: Serge Hallyn, linux-kernel, containers, Andrew Morton
Glauber Costa <glommer@parallels.com> writes:
> On 02/14/2013 06:27 PM, Serge Hallyn wrote:
>> Quoting Glauber Costa (glommer@parallels.com):
>>> Reboot support for pid namespaces is already implemented and it works
>>> well. However, in most containers the tasks will join all namespaces,
>>> including the now supported user namespace. In that situation, we will
>>> fail the "capable" test and won't be able to reboot.
>>>
>>> The proposed solution is to allow reboots for CAP_SYS_BOOT processes
>>> in the user namespace that owns the pid namespace.
>>>
>>> Signed-off-by: Glauber Costa <glommer@parallels.com>
>>
>> Note Li Zefan sent this identical patch last year. It's in my own
>> built userns kernel, and definately required :)
>>
> I didn't see that, and using Linus' master my stop container scripts
> stopped working after I started using Eric's userns...
The patch has been sitting in my for-next branch for quite a while
just waiting for the merge window.
Eric
commit 923c7538236564c46ee80c253a416705321f13e3
Author: Li Zefan <lizefan@huawei.com>
Date: Thu Dec 27 11:39:12 2012 +0800
userns: Allow unprivileged reboot
In a container with its own pid namespace and user namespace, rebooting
the system won't reboot the host, but terminate all the processes in
it and thus have the container shutdown, so it's safe.
Signed-off-by: Li Zefan <lizefan@huawei.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
diff --git a/kernel/sys.c b/kernel/sys.c
index 265b376..24d1ef5 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -433,11 +433,12 @@ static DEFINE_MUTEX(reboot_mutex);
SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
void __user *, arg)
{
+ struct pid_namespace *pid_ns = task_active_pid_ns(current);
char buffer[256];
int ret = 0;
/* We only trust the superuser with rebooting the system. */
- if (!capable(CAP_SYS_BOOT))
+ if (!ns_capable(pid_ns->user_ns, CAP_SYS_BOOT))
return -EPERM;
/* For safety, we require "magic" arguments. */
@@ -453,7 +454,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
* pid_namespace, the command is handled by reboot_pid_ns() which will
* call do_exit().
*/
- ret = reboot_pid_ns(task_active_pid_ns(current), cmd);
+ ret = reboot_pid_ns(pid_ns, cmd);
if (ret)
return ret;
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-02-15 7:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-14 11:56 [PATCH] kernel: allow reboots from user_ns Glauber Costa
2013-02-14 12:08 ` Daniel Lezcano
2013-02-14 14:27 ` Serge Hallyn
2013-02-14 14:30 ` Glauber Costa
2013-02-14 14:58 ` Eric W. Biederman
2013-02-15 7:00 ` Glauber Costa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox