From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757505Ab3A1Q6R (ORCPT ); Mon, 28 Jan 2013 11:58:17 -0500 Received: from cavan.codon.org.uk ([93.93.128.6]:56022 "EHLO cavan.codon.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754545Ab3A1Q6P (ORCPT ); Mon, 28 Jan 2013 11:58:15 -0500 From: Matthew Garrett To: linux-kernel@vger.kernel.org Cc: linux-efi@vger.kernel.org, linux-security-module@vger.kernel.org, Josh Boyer Subject: [PATCH 10/15] acpi: Ignore acpi_rsdp kernel parameter in a secure boot environment Date: Mon, 28 Jan 2013 11:42:34 -0500 Message-Id: <1359391359-25783-11-git-send-email-matthew.garrett@nebula.com> X-Mailer: git-send-email 1.8.0.2 In-Reply-To: <1359391359-25783-1-git-send-email-matthew.garrett@nebula.com> References: <1359391359-25783-1-git-send-email-matthew.garrett@nebula.com> X-SA-Do-Not-Run: Yes X-SA-Exim-Connect-IP: 2001:470:1f07:1371:6267:20ff:fec3:2318 X-SA-Exim-Mail-From: matthew.garrett@nebula.com X-SA-Exim-Scanned: No (on cavan.codon.org.uk); SAEximRunCond expanded to false 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. This could potentially be used to circumvent the secure boot trust model. We ignore the setting if we don't have the CAP_COMPROMISE_KERNEL capability. Signed-off-by: Josh Boyer --- drivers/acpi/osl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index bd22f86..88251d2 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -246,7 +246,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 && capable(CAP_COMPROMISE_KERNEL)) return acpi_rsdp; #endif -- 1.8.0.2