linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mimi Zohar <zohar@linux.vnet.ibm.com>
To: linux-integrity@vger.kernel.org
Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>,
	linux-security-module@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	"Luis R . Rodriguez" <mcgrof@kernel.org>,
	Eric Biederman <ebiederm@xmission.com>,
	kexec@lists.infradead.org, Andres Rodriguez <andresx7@gmail.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Kees Cook <keescook@chromium.org>
Subject: [PATCH v6 2/8] kexec: add call to LSM hook in original kexec_load syscall
Date: Fri, 13 Jul 2018 14:05:57 -0400	[thread overview]
Message-ID: <1531505163-20227-3-git-send-email-zohar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1531505163-20227-1-git-send-email-zohar@linux.vnet.ibm.com>

In order for LSMs and IMA-appraisal to differentiate between kexec_load
and kexec_file_load syscalls, both the original and new syscalls must
call an LSM hook.  This patch adds a call to security_kernel_load_data()
in the original kexec_load syscall.

Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Kees Cook <keescook@chromium.org>
Acked-by: Serge Hallyn <serge@hallyn.com>
---
 kernel/kexec.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/kernel/kexec.c b/kernel/kexec.c
index aed8fb2564b3..68559808fdfa 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -11,6 +11,7 @@
 #include <linux/capability.h>
 #include <linux/mm.h>
 #include <linux/file.h>
+#include <linux/security.h>
 #include <linux/kexec.h>
 #include <linux/mutex.h>
 #include <linux/list.h>
@@ -195,10 +196,17 @@ static int do_kexec_load(unsigned long entry, unsigned long nr_segments,
 static inline int kexec_load_check(unsigned long nr_segments,
 				   unsigned long flags)
 {
+	int result;
+
 	/* We only trust the superuser with rebooting the system. */
 	if (!capable(CAP_SYS_BOOT) || kexec_load_disabled)
 		return -EPERM;
 
+	/* Permit LSMs and IMA to fail the kexec */
+	result = security_kernel_load_data(LOADING_KEXEC_IMAGE);
+	if (result < 0)
+		return result;
+
 	/*
 	 * Verify we have a legal set of flags
 	 * This leaves us room for future extensions.
-- 
2.7.5


  parent reply	other threads:[~2018-07-13 18:07 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-13 18:05 [PATCH v6 0/8] kexec/firmware: support system wide policy requiring signatures Mimi Zohar
2018-07-13 18:05 ` [PATCH v6 1/8] security: define new LSM hook named security_kernel_load_data Mimi Zohar
2018-07-15  2:13   ` Kees Cook
2018-07-13 18:05 ` Mimi Zohar [this message]
2018-07-15  2:14   ` [PATCH v6 2/8] kexec: add call to LSM hook in original kexec_load syscall Kees Cook
2018-07-13 18:05 ` [PATCH v6 3/8] ima: based on policy require signed kexec kernel images Mimi Zohar
2018-07-15  2:21   ` Kees Cook
2018-07-13 18:05 ` [PATCH v6 4/8] firmware: add call to LSM hook before firmware sysfs fallback Mimi Zohar
2018-07-15  2:24   ` Kees Cook
2018-07-13 18:06 ` [PATCH v6 5/8] ima: based on policy require signed firmware (sysfs fallback) Mimi Zohar
2018-07-15  2:27   ` Kees Cook
2018-07-13 18:06 ` [PATCH v6 6/8] ima: add build time policy Mimi Zohar
2018-07-15  2:28   ` Kees Cook
2018-07-13 18:06 ` [PATCH v6 7/8] module: replace the existing LSM hook in init_module Mimi Zohar
2018-07-15  2:30   ` Kees Cook
2018-07-16 13:52     ` Mimi Zohar
2018-07-13 18:06 ` [PATCH v6 8/8] ima: based on policy warn about loading firmware (pre-allocated buffer) Mimi Zohar
2018-07-15  2:34   ` Kees Cook
2018-07-16 19:59 ` [PATCH v6 0/8] kexec/firmware: support system wide policy requiring signatures James Morris

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1531505163-20227-3-git-send-email-zohar@linux.vnet.ibm.com \
    --to=zohar@linux.vnet.ibm.com \
    --cc=andresx7@gmail.com \
    --cc=ebiederm@xmission.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=keescook@chromium.org \
    --cc=kexec@lists.infradead.org \
    --cc=linux-integrity@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=mcgrof@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).