From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751784AbdFERP5 (ORCPT ); Mon, 5 Jun 2017 13:15:57 -0400 Received: from terminus.zytor.com ([65.50.211.136]:44785 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751186AbdFERPy (ORCPT ); Mon, 5 Jun 2017 13:15:54 -0400 Date: Mon, 5 Jun 2017 10:10:23 -0700 From: tip-bot for Jan Kiszka Message-ID: Cc: hpa@zytor.com, mingo@kernel.org, ard.biesheuvel@linaro.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, matt@codeblueprint.co.uk, jan.kiszka@siemens.com, torvalds@linux-foundation.org, peterz@infradead.org Reply-To: hpa@zytor.com, mingo@kernel.org, ard.biesheuvel@linaro.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, matt@codeblueprint.co.uk, peterz@infradead.org, torvalds@linux-foundation.org, jan.kiszka@siemens.com In-Reply-To: <20170602135207.21708-3-ard.biesheuvel@linaro.org> References: <20170602135207.21708-3-ard.biesheuvel@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] efi/capsule: Fix return code on failing kmap/vmap Git-Commit-ID: fb153dc53f0eb8e8ad6a69f773e44c2d12daa5d0 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: fb153dc53f0eb8e8ad6a69f773e44c2d12daa5d0 Gitweb: http://git.kernel.org/tip/fb153dc53f0eb8e8ad6a69f773e44c2d12daa5d0 Author: Jan Kiszka AuthorDate: Fri, 2 Jun 2017 13:51:56 +0000 Committer: Ingo Molnar CommitDate: Mon, 5 Jun 2017 17:50:37 +0200 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 Signed-off-by: Ard Biesheuvel Reviewed-by: Matt Fleming Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/20170602135207.21708-3-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar --- drivers/firmware/efi/capsule-loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c index 9ae6c11..91e91f7 100644 --- 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;