[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20190621064340.GB4528@localhost.localdomain>
Date: Fri, 21 Jun 2019 14:43:40 +0800
From: Dave Young <dyoung@...hat.com>
To: Matthew Garrett <matthewgarrett@...gle.com>
Cc: jmorris@...ei.org, Jiri Bohac <jbohac@...e.cz>,
linux-api@...r.kernel.org, kexec@...ts.infradead.org,
linux-kernel@...r.kernel.org, Matthew Garrett <mjg59@...gle.com>,
dhowells@...hat.com, linux-security-module@...r.kernel.org,
luto@...nel.org
Subject: Re: [PATCH V31 07/25] kexec_file: Restrict at runtime if the kernel
is locked down
On 03/26/19 at 11:27am, Matthew Garrett wrote:
> From: Jiri Bohac <jbohac@...e.cz>
>
> When KEXEC_SIG is not enabled, kernel should not load images through
> kexec_file systemcall if the kernel is locked down.
>
> [Modified by David Howells to fit with modifications to the previous patch
> and to return -EPERM if the kernel is locked down for consistency with
> other lockdowns. Modified by Matthew Garrett to remove the IMA
> integration, which will be replaced by integrating with the IMA
> architecture policy patches.]
>
> Signed-off-by: Jiri Bohac <jbohac@...e.cz>
> Signed-off-by: David Howells <dhowells@...hat.com>
> Signed-off-by: Matthew Garrett <mjg59@...gle.com>
> Reviewed-by: Jiri Bohac <jbohac@...e.cz>
> cc: kexec@...ts.infradead.org
> ---
> kernel/kexec_file.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
> index 67f3a866eabe..a1cc37c8b43b 100644
> --- a/kernel/kexec_file.c
> +++ b/kernel/kexec_file.c
> @@ -239,6 +239,12 @@ kimage_file_prepare_segments(struct kimage *image, int kernel_fd, int initrd_fd,
> }
>
> ret = 0;
> +
> + if (kernel_is_locked_down(reason, LOCKDOWN_INTEGRITY)) {
> + ret = -EPERM;
> + goto out;
> + }
> +
Checking here is late, it would be good to move the check to earlier
code around below code:
/* We only trust the superuser with rebooting the system. */
if (!capable(CAP_SYS_BOOT) || kexec_load_disabled)
return -EPERM;
> break;
>
> /* All other errors are fatal, including nomem, unparseable
> --
> 2.21.0.392.gf8f6787159e-goog
>
>
> _______________________________________________
> kexec mailing list
> kexec@...ts.infradead.org
> http://lists.infradead.org/mailman/listinfo/kexec
Thanks
Dave
Powered by blists - more mailing lists