Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1;
MIME-Version: 1.0
References: <20231208143656.1019-1-areber@redhat.com>
In-Reply-To: <20231208143656.1019-1-areber@redhat.com>
From:   Andrei Vagin <avagin@gmail.com>
Date:   Fri, 8 Dec 2023 07:29:35 -0800
Message-ID: <CANaxB-wro4DRGosRhi1bB2jYdjM+1OihYTsnFOuAi_RKHnOm5w@mail.gmail.com>
Subject: Re: [PATCH v2] tty: allow TIOCSLCKTRMIOS with CAP_CHECKPOINT_RESTORE
To:     Adrian Reber <areber@redhat.com>
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Jiri Slaby <jirislaby@kernel.org>,
        linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org,
        Christian Brauner <brauner@kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, Dec 8, 2023 at 6:37=E2=80=AFAM Adrian Reber <areber@redhat.com> wro=
te:
>
> The capability CAP_CHECKPOINT_RESTORE was introduced to allow non-root
> users to checkpoint and restore processes as non-root with CRIU.
>
> This change extends CAP_CHECKPOINT_RESTORE to enable the CRIU option
> '--shell-job' as non-root. CRIU's man-page describes the '--shell-job'
> option like this:
>
>   Allow one to dump shell jobs. This implies the restored task will
>   inherit session and process group ID from the criu itself. This option
>   also allows to migrate a single external tty connection, to migrate
>   applications like top.
>
> TIOCSLCKTRMIOS can only be done if the process has CAP_SYS_ADMIN and
> this change extends it to CAP_SYS_ADMIN or CAP_CHECKPOINT_RESTORE.
>
> With this change it is possible to checkpoint and restore processes
> which have a tty connection as non-root if CAP_CHECKPOINT_RESTORE is
> set.
>

Acked-by: Andrei Vagin <avagin@gmail.com>

> Acked-by: Christian Brauner <brauner@kernel.org>
> Signed-off-by: Adrian Reber <areber@redhat.com>
> ---
> Changes in v2:
> - replaced "if (!capable(CAP_SYS_ADMIN) && !capable(CAP_CHECKPOINT_RESTOR=
E))"
>   with "if (!checkpoint_restore_ns_capable(&init_user_ns))" as suggested
>   by Christian Brauner
> - v1: https://lore.kernel.org/linux-serial/20231206134340.7093-1-areber@r=
edhat.com/
> ---
>  drivers/tty/tty_ioctl.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
> index 4b499301a3db..85de90eebc7b 100644
> --- a/drivers/tty/tty_ioctl.c
> +++ b/drivers/tty/tty_ioctl.c
> @@ -844,7 +844,7 @@ int tty_mode_ioctl(struct tty_struct *tty, unsigned i=
nt cmd, unsigned long arg)
>                         ret =3D -EFAULT;
>                 return ret;
>         case TIOCSLCKTRMIOS:
> -               if (!capable(CAP_SYS_ADMIN))
> +               if (!checkpoint_restore_ns_capable(&init_user_ns))
>                         return -EPERM;
>                 copy_termios_locked(real_tty, &kterm);
>                 if (user_termios_to_kernel_termios(&kterm,
> @@ -861,7 +861,7 @@ int tty_mode_ioctl(struct tty_struct *tty, unsigned i=
nt cmd, unsigned long arg)
>                         ret =3D -EFAULT;
>                 return ret;
>         case TIOCSLCKTRMIOS:
> -               if (!capable(CAP_SYS_ADMIN))
> +               if (!checkpoint_restore_ns_capable(&init_user_ns))
>                         return -EPERM;
>                 copy_termios_locked(real_tty, &kterm);
>                 if (user_termios_to_kernel_termios_1(&kterm,
>
> base-commit: 98b1cc82c4affc16f5598d4fa14b1858671b2263
> --
> 2.43.0
>