Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754699Ab3H3Xlo (ORCPT ); Fri, 30 Aug 2013 19:41:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63755 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752791Ab3H3Xln (ORCPT ); Fri, 30 Aug 2013 19:41:43 -0400 Date: Fri, 30 Aug 2013 19:41:33 -0400 From: Josh Boyer To: "H. Peter Anvin" Cc: Matthew Garrett , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, keescook@chromium.org Subject: Re: [PATCH V2 10/10] Add option to automatically enforce module signatures when in Secure Boot mode Message-ID: <20130830234133.GR20828@hansolo.jdub.homelinux.org> References: <1376933171-9854-1-git-send-email-matthew.garrett@nebula.com> <1376933171-9854-11-git-send-email-matthew.garrett@nebula.com> <20130829183713.GT20828@hansolo.jdub.homelinux.org> <522104A6.5000700@zytor.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <522104A6.5000700@zytor.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1958 Lines: 48 On Fri, Aug 30, 2013 at 01:46:30PM -0700, H. Peter Anvin wrote: > On 08/29/2013 11:37 AM, Josh Boyer wrote: > >> setup_efi_pci(boot_params); > >> diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h > >> index c15ddaf..d35da96 100644 > >> --- a/arch/x86/include/uapi/asm/bootparam.h > >> +++ b/arch/x86/include/uapi/asm/bootparam.h > >> @@ -131,7 +131,8 @@ struct boot_params { > >> __u8 eddbuf_entries; /* 0x1e9 */ > >> __u8 edd_mbr_sig_buf_entries; /* 0x1ea */ > >> __u8 kbd_status; /* 0x1eb */ > >> - __u8 _pad5[3]; /* 0x1ec */ > >> + __u8 secure_boot; /* 0x1ec */ > >> + __u8 _pad5[2]; /* 0x1ec */ > >> /* > >> * The sentinel is set to a nonzero value (0xff) in header.S. > >> * > > > > You need to include the following chunk of code with this, otherwise the > > secure_boot variable gets cleared. > > > > Not really. > > There are three cases: > > 1. Boot stub only. Here we do the right thing with the bootparams. > 2. Boot loader bypasses the boot stub completely. Here we MUST NOT do > what you suggest above. > 3. Boot stub with a boot_params structure passed in. Here we should > run sanitize_boot_params() (an inline for a reason) in the boot > stub, before we set the secure_boot field. Once that is done, we > again don't need that modification. OK. If 3 works, then great. All I know is that Fedora has been carrying the above hunk for months and it was missing in this patch set. So when I went to test it, the patches didn't do anything because the secure_boot field was getting cleared. I'm more than happy to try option 3, and I'll poke at it next week unless someone beats me to it. josh -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/