From patchwork Fri Jun 2 13:51:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 101253 Delivered-To: patch@linaro.org Received: by 10.182.202.35 with SMTP id kf3csp204862obc; Fri, 2 Jun 2017 06:54:58 -0700 (PDT) X-Received: by 10.99.113.78 with SMTP id b14mr7295772pgn.229.1496411698376; Fri, 02 Jun 2017 06:54:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496411698; cv=none; d=google.com; s=arc-20160816; b=Kq8623RqQouwSP60g5JFy4a4U1OW+EqgeIsKaFdaxgvgEKPuCgmDtmbGDe2Spkagss eiO8a2gN/34icq5b8qjBS3ZbVpZ6ebTBdHD3x82jchFiX+TK/cfUw814n/qmUzSq/xYL nXQDWdJDq2K7q8e0yg3Tt0qkuaAJd9uUvrhRCapTVymb4scfX9ElOrP9ZThZaiyqUE1o Wm1KrYDpSNhxkrDjCABV6AYU0Fv15rLuySkPc0wSR3BxTgNNX77nw5ydzrdsX0Rdqj/M nJL6FXBeKWiLyViSOgCgkT5oMHQAs6JgT7Q424a+DuWETUEsgUHEaWD4pOPJ0BIV0aV3 eQQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=Cxt9fM5mu6VSRL7FGE9yuct9/YyykkF5vTTr1LM6Y8Q=; b=lDT9xLyzK26Zokdi277oW9yKN5VwQiXkAkExs6tq8imOnZ6VC4rZuDt2o7Qu+Tf2jx KO9HjepKG8teIAuaLfWJfeaK8vw6SZ2w5Ucrbi+Nf64biWQCxFaW9OcJrwdzTcQ+KO4U Qi4O+NIM3QqvIJ1oUT1rqI+oGyxZBNdjrMAkAqJSD4nsoW+dVqb2y4QzdqykBaMKJ5I6 gFcZC3HmPRaxb2qTdLeJMEsAQYgxIfm3wbuVb+a9bnrSBaMa9qu/EkBTUBvLkwy5DVyE eu0uXTGq0z1QWIPr+vB9LAZer37ggnYfh7VDciH5JAoB2lnah5hebxuS6jKP5FEV9Acq lqmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si22752624pgu.95.2017.06.02.06.54.58; Fri, 02 Jun 2017 06:54:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751475AbdFBNyt (ORCPT + 25 others); Fri, 2 Jun 2017 09:54:49 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:38447 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751148AbdFBNyq (ORCPT ); Fri, 2 Jun 2017 09:54:46 -0400 Received: by mail-wm0-f53.google.com with SMTP id n195so27626763wmg.1 for ; Fri, 02 Jun 2017 06:54:46 -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=Cxt9fM5mu6VSRL7FGE9yuct9/YyykkF5vTTr1LM6Y8Q=; b=iQM5LkOZB3P5+G+O8wwBWV1HEVhpFMraf3SAcKyz1r4ovIDn3qdY0eYKbhFHpT4L10 6kEGjYj12fFnxj1SjtWVfU0qGctaOJKc6qR4DRdZmeRvC4xBj5YLIjUJ1ob8iVnfRfUg wpia4ueU876G1QvyeBCAo6KTXRU04Hzh1JTLc= 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=Cxt9fM5mu6VSRL7FGE9yuct9/YyykkF5vTTr1LM6Y8Q=; b=WWlbLThga8/K4t9uNPoktqyUix4eYLqXvB7vszqXCHgyx5Tt0Yf9VRcZlNDgLzIZjv 46xz5xAXHsIU5q8pIe5o6FGLcqvkwToSqFfdFuoSTgc5dTBmKTxCK+Z8ViSHKRfu1KZi rwGepQA9ST6MvD1TnnciXhaE0m80SSqgrHqLRp7dlW5NQgFFcy1PYpL4OLYeINXw0svp gW44AiVYHHuKsEM/QxcsM8PfnOiESW8+3Rbq9T+hHzKaAmNOfb+NQK1mgb6tKalMNUyy hgXdXud3wl21dV1Z6GDeYaAqRj+tuTnhaNySR/laka1moC3iZpSXoVsLHF047h0J+iZ0 V79w== X-Gm-Message-State: AODbwcA/u3DcrfmA9288k7PIh0OmuD29zxZ4jfNfdMBB/7q0EiMf5iX6 yi6Jmpb0TDwoqpG5FNaWpg== X-Received: by 10.80.143.5 with SMTP id 5mr6247272edy.68.1496411685367; Fri, 02 Jun 2017 06:54:45 -0700 (PDT) Received: from localhost.localdomain ([105.151.155.95]) by smtp.gmail.com with ESMTPSA id g48sm9756076edc.8.2017.06.02.06.54.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Jun 2017 06:54:44 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" Cc: Jan Kiszka , Ard Biesheuvel , linux-kernel@vger.kernel.org Subject: [PATCH 02/13] efi/capsule: Fix return code on failing kmap/vmap Date: Fri, 2 Jun 2017 13:51:56 +0000 Message-Id: <20170602135207.21708-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170602135207.21708-1-ard.biesheuvel@linaro.org> References: <20170602135207.21708-1-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 Reviewed-by: Matt Fleming Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/capsule-loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.3 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;