From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757364AbbCMVj4 (ORCPT ); Fri, 13 Mar 2015 17:39:56 -0400 Received: from cavan.codon.org.uk ([93.93.128.6]:60988 "EHLO cavan.codon.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757175AbbCMVju (ORCPT ); Fri, 13 Mar 2015 17:39:50 -0400 From: Matthew Garrett To: linux-security-module@vger.kernel.org Cc: james.l.morris@oracle.com, serge@hallyn.com, linux-kernel@vger.kernel.org, keescook@chromium.org, hpa@zytor.com, gnomes@lxorguk.ukuu.org.uk, Josh Boyer Date: Fri, 13 Mar 2015 11:38:23 -1000 Message-Id: <1426282708-21485-8-git-send-email-matthew.garrett@nebula.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1426282708-21485-1-git-send-email-matthew.garrett@nebula.com> References: <1426282708-21485-1-git-send-email-matthew.garrett@nebula.com> X-SA-Do-Not-Run: Yes X-SA-Exim-Connect-IP: 72.253.89.114 X-SA-Exim-Mail-From: matthew.garrett@nebula.com X-Spam-ASN: Subject: [PATCH 07/12] acpi: Ignore acpi_rsdp kernel parameter when trusted_kernel is true. X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:54:46 +0000) X-SA-Exim-Scanned: Yes (on cavan.codon.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Josh Boyer This option allows userspace to pass the RSDP address to the kernel, which makes it possible for a user to execute arbitrary code in the kernel. Disable this when trusted_kernel is true. Signed-off-by: Josh Boyer --- drivers/acpi/osl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index f9eeae8..6984fc0 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -255,7 +256,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp); acpi_physical_address __init acpi_os_get_root_pointer(void) { #ifdef CONFIG_KEXEC - if (acpi_rsdp) + if (acpi_rsdp && !get_trusted_kernel()) return acpi_rsdp; #endif -- 2.1.0