From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZrO3PZuuzPqH1vsOX6XhOjl50GIF13+uZSdaztPC/3EjB7gxR3fto7wN3M5aGA46LDrw754 ARC-Seal: i=1; a=rsa-sha256; t=1526937624; cv=none; d=google.com; s=arc-20160816; b=NQwhwPpxBLl+otRRJa3XZNP2Wo216eOHHMCGI0j/ktI2ObcUh9//SEHbH+qbeW7v2l lrPxFYlp2wLyExp6F66pribvibLk2J1ymPx0TYJxhRM/+9si9Q5Rbx7zx9wZJicxrBJI D2rnV1fCTSLHKKHWArAZGCfvIBUaO9yp52yFZBpbllewri1OPpvgiq+GjLZz2kJsoOrY 7Q1G6NzEnXRQQR33A6sYFmAfcFCpE8hS6MdEjciEMLOZ9GzioiOS4PelA+eZet1Zk1hK rE+kJJVrAAx8bBtUU/6l6WOVyUnaZGfWz3ooVpYYOT0RC9XoJKbO5GRzoj+Wpdkmp2Dk /LjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=/kWvmVdbsCCWV3803F7gB91g3kFf2/88QgdoLEy5xII=; b=HBzkkQ6Ukglve+qbwiZt7EFy22Rf9VHU+0KRL6f8zykn1oJrp64E36ZjQSu7wytmlF pMQJZ53IhQN3Mm9vhlbC7w5X0gfCOgyeUFUdL92ZRmxUgqq5WMKAyHR9r42L/lU6J9w5 0L11FzKNEVgJKRMFvL4tPiesdATY0mbYHoCbVNt803LR2quYQu9W4kB83M2XlmS54OXv 4VcCV/vFnXgVPinDcHF9bmRz2X0Gjohepk99o2wYL3v91Qd7fJslmpLNWhlM3fjkaItf zXTwEfaIAqV3kikszWiB6G3E0pZO5kiRMlQV2Zg2cAs7Oq1GE0ytAS24axZTU8lD1nRd qFIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dBwGcqjB; spf=pass (google.com: domain of srs0=nia/=ii=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=nia/=II=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dBwGcqjB; spf=pass (google.com: domain of srs0=nia/=ii=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=nia/=II=linuxfoundation.org=gregkh@kernel.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans de Goede , Ard Biesheuvel , Linus Torvalds , Matt Fleming , Peter Zijlstra , Thomas Gleixner , linux-efi@vger.kernel.org, Ingo Molnar Subject: [PATCH 4.14 34/95] efi: Avoid potential crashes, fix the struct efi_pci_io_protocol_32 definition for mixed mode Date: Mon, 21 May 2018 23:11:24 +0200 Message-Id: <20180521210454.955873306@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180521210447.219380974@linuxfoundation.org> References: <20180521210447.219380974@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1601109790218666482?= X-GMAIL-MSGID: =?utf-8?q?1601110146515878091?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ard Biesheuvel commit 0b3225ab9407f557a8e20f23f37aa7236c10a9b1 upstream. Mixed mode allows a kernel built for x86_64 to interact with 32-bit EFI firmware, but requires us to define all struct definitions carefully when it comes to pointer sizes. 'struct efi_pci_io_protocol_32' currently uses a 'void *' for the 'romimage' field, which will be interpreted as a 64-bit field on such kernels, potentially resulting in bogus memory references and subsequent crashes. Tested-by: Hans de Goede Signed-off-by: Ard Biesheuvel Cc: Cc: Linus Torvalds Cc: Matt Fleming Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/20180504060003.19618-13-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- arch/x86/boot/compressed/eboot.c | 6 ++++-- include/linux/efi.h | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -163,7 +163,8 @@ __setup_efi_pci32(efi_pci_io_protocol_32 if (status != EFI_SUCCESS) goto free_struct; - memcpy(rom->romdata, pci->romimage, pci->romsize); + memcpy(rom->romdata, (void *)(unsigned long)pci->romimage, + pci->romsize); return status; free_struct: @@ -269,7 +270,8 @@ __setup_efi_pci64(efi_pci_io_protocol_64 if (status != EFI_SUCCESS) goto free_struct; - memcpy(rom->romdata, pci->romimage, pci->romsize); + memcpy(rom->romdata, (void *)(unsigned long)pci->romimage, + pci->romsize); return status; free_struct: --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -395,8 +395,8 @@ typedef struct { u32 attributes; u32 get_bar_attributes; u32 set_bar_attributes; - uint64_t romsize; - void *romimage; + u64 romsize; + u32 romimage; } efi_pci_io_protocol_32; typedef struct { @@ -415,8 +415,8 @@ typedef struct { u64 attributes; u64 get_bar_attributes; u64 set_bar_attributes; - uint64_t romsize; - void *romimage; + u64 romsize; + u64 romimage; } efi_pci_io_protocol_64; typedef struct {