From patchwork Tue Mar 19 17:07:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Boyer X-Patchwork-Id: 229145 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1A11E2C0097 for ; Wed, 20 Mar 2013 04:07:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932900Ab3CSRH5 (ORCPT ); Tue, 19 Mar 2013 13:07:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55933 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757027Ab3CSRH4 (ORCPT ); Tue, 19 Mar 2013 13:07:56 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2JH7oCM002692 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 19 Mar 2013 13:07:50 -0400 Received: from hansolo.jdub.homelinux.org (ovpn-113-63.phx2.redhat.com [10.3.113.63]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2JH7meC024414 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Tue, 19 Mar 2013 13:07:50 -0400 Date: Tue, 19 Mar 2013 13:07:48 -0400 From: Josh Boyer To: Matthew Garrett Cc: Dave Young , linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, linux-efi@vger.kernel.org, kexec@lists.infradead.org, linux-pci@vger.kernel.org Subject: [PATCH v2] acpi: Ignore acpi_rsdp kernel parameter in a secure boot environment Message-ID: <20130319170747.GA15821@hansolo.jdub.homelinux.org> References: <1363642353-30749-1-git-send-email-matthew.garrett@nebula.com> <1363642353-30749-10-git-send-email-matthew.garrett@nebula.com> <5148261F.3030806@redhat.com> <20130319111916.GI11243@hansolo.jdub.homelinux.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130319111916.GI11243@hansolo.jdub.homelinux.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This option allows userspace to pass the RSDP address to the kernel. This could potentially be used to circumvent the secure boot trust model. This is setup through the setup_arch function, which is called before the security_init function sets up the security_ops, so we cannot use a capable call here. We ignore the setting if we are booted in Secure Boot mode. Signed-off-by: Josh Boyer --- v2: Actually send it to Matthew this time 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 586e7e9..8950454 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -245,7 +245,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 && !efi_enabled(EFI_SECURE_BOOT)) return acpi_rsdp; #endif