lkml.org 
[lkml]   [2018]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 042/141] x86: boot: Fix EFI stub alignment
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ben Hutchings <ben@decadent.org.uk>

    [ Upstream commit 9c1442a9d039a1a3302fa93e9a11001c5f23b624 ]

    We currently align the end of the compressed image to a multiple of
    16. However, the PE-COFF header included in the EFI stub says that
    the file alignment is 32 bytes, and when adding an EFI signature to
    the file it must first be padded to this alignment.

    sbsigntool commands warn about this:

    warning: file-aligned section .text extends beyond end of file
    warning: checksum areas are greater than image size. Invalid section table?

    Worse, pesign -at least when creating a detached signature- uses the
    hash of the unpadded file, resulting in an invalid signature if
    padding is required.

    Avoid both these problems by increasing alignment to 32 bytes when
    CONFIG_EFI_STUB is enabled.

    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/x86/boot/tools/build.c | 7 +++++++
    1 file changed, 7 insertions(+)

    --- a/arch/x86/boot/tools/build.c
    +++ b/arch/x86/boot/tools/build.c
    @@ -390,6 +390,13 @@ int main(int argc, char ** argv)
    die("Unable to mmap '%s': %m", argv[2]);
    /* Number of 16-byte paragraphs, including space for a 4-byte CRC */
    sys_size = (sz + 15 + 4) / 16;
    +#ifdef CONFIG_EFI_STUB
    + /*
    + * COFF requires minimum 32-byte alignment of sections, and
    + * adding a signature is problematic without that alignment.
    + */
    + sys_size = (sys_size + 1) & ~1;
    +#endif

    /* Patch the setup code with the appropriate size parameters */
    buf[0x1f1] = setup_sectors-1;

    \
     
     \ /
      Last update: 2018-11-11 23:45    [W:5.742 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site