efi/capsule: Fix return code on failing kmap/vmap

If kmap or vmap fail, it means we ran out of memory. There are no
user-provided addressed involved that would justify EFAULT.

Signed-off-by: Jan Kiszka <[email protected]>
Signed-off-by: Ard Biesheuvel <[email protected]>
Reviewed-by: Matt Fleming <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c
index 9ae6c116c4746286770052fb6f241baddc08d5b0..91e91f7a880776c68f422db7298afda4e293baf2 100644 (file)
--- a/drivers/firmware/efi/capsule-loader.c
+++ b/drivers/firmware/efi/capsule-loader.c
@@ -113,7 +113,7 @@ static ssize_t efi_capsule_submit_update(struct capsule_info *cap_info)
                        VM_MAP, PAGE_KERNEL);
        if (!cap_hdr_temp) {
                pr_debug("%s: vmap() failed\n", __func__);
-               return -EFAULT;
+               return -ENOMEM;
        }
 
        ret = efi_capsule_update(cap_hdr_temp, cap_info->pages);
@@ -185,7 +185,7 @@ static ssize_t efi_capsule_write(struct file *file, const char __user *buff,
        kbuff = kmap(page);
        if (!kbuff) {
                pr_debug("%s: kmap() failed\n", __func__);
-               ret = -EFAULT;
+               ret = -ENOMEM;
                goto failed;
        }
        kbuff += PAGE_SIZE - cap_info->page_bytes_remain;