From patchwork Wed Apr 5 09:23:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 96793 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp173369qgd; Wed, 5 Apr 2017 02:23:45 -0700 (PDT) X-Received: by 10.98.71.151 with SMTP id p23mr27549057pfi.252.1491384225571; Wed, 05 Apr 2017 02:23:45 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y73si20044853pgd.394.2017.04.05.02.23.45; Wed, 05 Apr 2017 02:23:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933076AbdDEJXb (ORCPT + 2 others); Wed, 5 Apr 2017 05:23:31 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:36282 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932632AbdDEJXa (ORCPT ); Wed, 5 Apr 2017 05:23:30 -0400 Received: by mail-wm0-f41.google.com with SMTP id o81so44872550wmb.1 for ; Wed, 05 Apr 2017 02:23:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bHcTYY1QGmzaEu59N+/dWbxmEtlmMr4EIgSwpX4l6gY=; b=CWG86LL147yWHW0QIGX0919qzZ8H+PwAx0mrVu+25qDtx4lO1Z5gi2mwGF8WQu1y22 yEZatlsUUkUqxhY90PoouofkHo7Fo/f6PA1eRGHWgaC6jZZzK55Wf4DPkUbLj9uvwJDH ZfJRdLYZjxRg2ITG070kdUtyMfWJd3B/Is9ek= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bHcTYY1QGmzaEu59N+/dWbxmEtlmMr4EIgSwpX4l6gY=; b=SA3EDi3CIvZeLt0URP0zhdNSET9Pu8xYTWSM/Gh/zF91vKrFkyN6oPqYsq8FlLqa3J LTusHpsheezQpYZ+dx6f20ETazJLMDzXalkwVSTmRH7fllx0dM9G89yMXoDvnGrQ/la6 YMRPK7Fi9mUBXMghTe5hVwH4HLMzYVJN7yv/raWK8i/icRTA7Y+JtzZkJRyL/DTBz/10 En1zHRbe3WGydEWdNSSoQQK42KcePxZBclyu/VGJpSDTjzcU0PkojHYIL4faBCWjFOh5 Y8iyGzgtZBnkM9MZnXoJhs6RT/NH7vdv+g8zfLfBPzuz/HGlkLR/hOpKnyaVqz0Ins7g wI8A== X-Gm-Message-State: AFeK/H3gviPLmV5vJQv//qziaBi+NWWoE//f0IK2dXZLlslNursfglXr RaLZ4ufx+k//ClDhcJxm8Q== X-Received: by 10.28.137.208 with SMTP id l199mr17416187wmd.65.1491384208961; Wed, 05 Apr 2017 02:23:28 -0700 (PDT) Received: from localhost.localdomain ([160.163.145.113]) by smtp.gmail.com with ESMTPSA id b66sm23935271wrd.29.2017.04.05.02.23.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Apr 2017 02:23:28 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: matt@codeblueprint.co.uk, andy.shevchenko@gmail.com, pure.logic@nexus-software.ie, hock.leong.kweh@intel.com, bp@alien8.de, sascha.weisenberger@siemens.com, jan.kiszka@siemens.com, Ard Biesheuvel Subject: [PATCH 1/8] efi/capsule: Fix return code on failing kmap/vmap Date: Wed, 5 Apr 2017 10:23:10 +0100 Message-Id: <20170405092317.27921-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170405092317.27921-1-ard.biesheuvel@linaro.org> References: <20170405092317.27921-1-ard.biesheuvel@linaro.org> Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org From: Jan Kiszka 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 Cc: Matt Fleming Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/capsule-loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Reviewed-by: Matt Fleming diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c index 9ae6c116c474..91e91f7a8807 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;