Commit 6862e6ad authored by Austin Christ's avatar Austin Christ Committed by Ingo Molnar

efi/capsule: Allocate whole capsule into virtual memory

According to UEFI 2.6 section 7.5.3, the capsule should be in contiguous
virtual memory and firmware may consume the capsule immediately. To
correctly implement this functionality, the kernel driver needs to vmap
the entire capsule at the time it is made available to firmware.

The virtual allocation of the capsule update has been changed from kmap,
which was only allocating the first page of the update, to vmap, and
allocates the entire data payload.
Signed-off-by: default avatarAustin Christ <austinwc@codeaurora.org>
Signed-off-by: default avatarMatt Fleming <matt@codeblueprint.co.uk>
Reviewed-by: default avatarMatt Fleming <matt@codeblueprint.co.uk>
Reviewed-by: default avatarLee, Chun-Yi <jlee@suse.com>
Cc: <stable@vger.kernel.org> # v4.7
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Bryan O'Donoghue <pure.logic@nexus-software.ie>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kweh Hock Leong <hock.leong.kweh@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/1470912120-22831-3-git-send-email-matt@codeblueprint.co.ukSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent f72075c9
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/efi.h> #include <linux/efi.h>
#include <linux/vmalloc.h>
#define NO_FURTHER_WRITE_ACTION -1 #define NO_FURTHER_WRITE_ACTION -1
...@@ -108,14 +109,15 @@ static ssize_t efi_capsule_submit_update(struct capsule_info *cap_info) ...@@ -108,14 +109,15 @@ static ssize_t efi_capsule_submit_update(struct capsule_info *cap_info)
int ret; int ret;
void *cap_hdr_temp; void *cap_hdr_temp;
cap_hdr_temp = kmap(cap_info->pages[0]); cap_hdr_temp = vmap(cap_info->pages, cap_info->index,
VM_MAP, PAGE_KERNEL);
if (!cap_hdr_temp) { if (!cap_hdr_temp) {
pr_debug("%s: kmap() failed\n", __func__); pr_debug("%s: vmap() failed\n", __func__);
return -EFAULT; return -EFAULT;
} }
ret = efi_capsule_update(cap_hdr_temp, cap_info->pages); ret = efi_capsule_update(cap_hdr_temp, cap_info->pages);
kunmap(cap_info->pages[0]); vunmap(cap_hdr_temp);
if (ret) { if (ret) {
pr_err("%s: efi_capsule_update() failed\n", __func__); pr_err("%s: efi_capsule_update() failed\n", __func__);
return ret; return ret;
......
...@@ -190,9 +190,9 @@ efi_capsule_update_locked(efi_capsule_header_t *capsule, ...@@ -190,9 +190,9 @@ efi_capsule_update_locked(efi_capsule_header_t *capsule,
* map the capsule described by @capsule with its data in @pages and * map the capsule described by @capsule with its data in @pages and
* send it to the firmware via the UpdateCapsule() runtime service. * send it to the firmware via the UpdateCapsule() runtime service.
* *
* @capsule must be a virtual mapping of the first page in @pages * @capsule must be a virtual mapping of the complete capsule update in the
* (@pages[0]) in the kernel address space. That is, a * kernel address space, as the capsule can be consumed immediately.
* capsule_header_t that describes the entire contents of the capsule * A capsule_header_t that describes the entire contents of the capsule
* must be at the start of the first data page. * must be at the start of the first data page.
* *
* Even though this function will validate that the firmware supports * Even though this function will validate that the firmware supports
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment