Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1629049

Re: [PATCH v2 1/2] tiocsti-restrict : Add owner user namespace to tty_struct

Show all headers | View raw

On Sun, Apr 23, 2017 at 9:24 AM, Matt Brown <matt@nmatt.com> wrote:
> This patch adds struct user_namespace *owner_user_ns to the tty_struct.
> Then it is set to current_user_ns() in the alloc_tty_struct function.
>
> This is done to facilitate capability checks against the original user
> namespace that allocated the tty.
>
> E.g. ns_capable(tty->owner_user_ns,CAP_SYS_ADMIN)
>
> This combined with the use of user namespace's will allow hardening
> protections to be built to mitigate container escapes that utilize TTY
> ioctls such as TIOCSTI.
>
> See: https://bugzilla.redhat.com/show_bug.cgi?id=1411256
>
> Signed-off-by: Matt Brown <matt@nmatt.com>
> ---
>  drivers/tty/tty_io.c | 1 +
>  include/linux/tty.h  | 2 ++
>  2 files changed, 3 insertions(+)
>
> diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
> index e6d1a65..e774385 100644
> --- a/drivers/tty/tty_io.c
> +++ b/drivers/tty/tty_io.c
> @@ -3191,6 +3191,7 @@ struct tty_struct *alloc_tty_struct(struct tty_driver *driver, int idx)
>         tty->index = idx;
>         tty_line_name(driver, idx, tty->name);
>         tty->dev = tty_get_device(tty);
> +       tty->owner_user_ns = current_user_ns();

Why are you not taking a reference to the userns?

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 1/2] tiocsti-restrict : Add owner user namespace to tty_struct Matt Brown <matt@nmatt.com> - 2017-04-23 09:30 +0200
  [PATCH v2 2/2] tiocsti-restrict : make TIOCSTI ioctl require CAP_SYS_ADMIN Matt Brown <matt@nmatt.com> - 2017-04-23 09:30 +0200
  Re: [PATCH v2 1/2] tiocsti-restrict : Add owner user namespace to tty_struct Jann Horn <jannh@google.com> - 2017-04-23 19:10 +0200
    Re: [PATCH v2 1/2] tiocsti-restrict : Add owner user namespace to  tty_struct Matt Brown <matt@nmatt.com> - 2017-04-23 22:30 +0200
      Re: [PATCH v2 1/2] tiocsti-restrict : Add owner user namespace to tty_struct Jann Horn <jannh@google.com> - 2017-04-23 23:00 +0200

csiph-web