From patchwork Fri Jun 2 13:52:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 101256 Delivered-To: patch@linaro.org Received: by 10.182.202.35 with SMTP id kf3csp204923obc; Fri, 2 Jun 2017 06:55:07 -0700 (PDT) X-Received: by 10.101.90.12 with SMTP id y12mr7548117pgs.226.1496411707448; Fri, 02 Jun 2017 06:55:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496411707; cv=none; d=google.com; s=arc-20160816; b=gq9qfMY39amhOc4Z/OVcR01jgUc8sUoqe7mtVMSlTOQYCAe8EnEWthifT6Ap2vskw9 B21Vqvscn9gISvZyh/yjLXY7wAHvOS++Rak0tgo8plWpCqjTBNdSEW7vxrumDN44smHe TTsIj+PckyBl6yT3Pb2MzoOKJA8TvgXBQkMTqXEEKGD3+czpAkJha/ShfJHekDIFm/90 u8QPySHdThr3tPAWVXIjje2d2Zlw42dAS6gJ16gAXZOPmgwAtHrWqg7SDhWOsbICdgC5 /uXGf+fsLNpm0zYfbhe31CCcbprUdUySLLpBEk/UvsExbuvBHP15FjzPb4dM6hyDad7y OAuA== 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=IAkeNrXbWWnhCqVtzCIcH/U2l2WiXQJOywD/mRK4uQw=; b=J+Q3u9O3vy5CJiijDESdjkODOcNKfPlkm+An1A9NQIiBriJ14yStv65KdIBk0tKUMV 6+nffKeloYIuKcY3p4ENuPIwvh4jO8NOHeyJLOR3AmMtP8p0kHtdqonz6T+aWqwy72nK HoAvxW5AkAgxUBoDVWIxoxOCUpkKtlIZWtfV5vmqyk4uey44kv1fSkqY6F7fVnTIadiE di0jh/du7HiJ2OJHSmPIeulOHsw3onZJ39Rmqmb/MFoNqn/mZPrixfTk9jyYQFdg+BOU +7UsWxAZI54KDowmANiLto2Y8vtuFSzNxNNxybhgKZZiqTMsxYMkz6cy9QvluSo9WiVI 1+cw== 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 e27si23536237pfj.41.2017.06.02.06.55.06; Fri, 02 Jun 2017 06:55:07 -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 S1751558AbdFBNzD (ORCPT + 25 others); Fri, 2 Jun 2017 09:55:03 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:35010 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751519AbdFBNy7 (ORCPT ); Fri, 2 Jun 2017 09:54:59 -0400 Received: by mail-wm0-f49.google.com with SMTP id b84so26396470wmh.0 for ; Fri, 02 Jun 2017 06:54:58 -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=IAkeNrXbWWnhCqVtzCIcH/U2l2WiXQJOywD/mRK4uQw=; b=bXZljOmQG/BvVPyil9EYtyou6lcDuMka7jWVx8AinFFaGSG1vTnucLlGyIqabYNGdK PeMbZGPXgDR6mLGxbJRkv8h69MF4Re4dVoIBG12ZQRvjBmACpTMk/DZ3rWXQAk9bkoRO pt7JW3b1mY12rRJc2BhcRLBs7tCJYR60/j++o= 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=IAkeNrXbWWnhCqVtzCIcH/U2l2WiXQJOywD/mRK4uQw=; b=Og+v8t+xdzC3P/OyaxN9HMruRQJ8afbBH5HNYa5Qk/gky4o+X3eyWb36TA3j9neXmh pUNh2Umv+OAe4KSZugHDY5qmSNXPxW9RCA3c9vIGRXBmOlXWphT8nU3G7+qlUKwQCZWh cPUXTIG76f0txQqh7nsLuzBzEhhFt/+BHWZgac+EUu3zOINlEbrzN2ibpqIg67HZKgif 7H6vZl0Rf5I3QxbopRfErD89apcqySDoVQtEQlHQCRlDttEOhApaG1AkckXMvWedDSwy pPcSaCkVsW6XM+nDMP5hDPeygEld/l05yW0CSub6CuOVwFiS/Zc/zNQasDjMXzVKWAJX 5+vQ== X-Gm-Message-State: AODbwcApZhVeI1I3or2pElrindi5Qj2VX835JUA6Pml2qcpxe7uJ3tek o6hg9aLzt3D+RUL1 X-Received: by 10.80.175.131 with SMTP id h3mr6052045edd.87.1496411697779; Fri, 02 Jun 2017 06:54:57 -0700 (PDT) Received: from localhost.localdomain ([105.151.155.95]) by smtp.gmail.com with ESMTPSA id g48sm9756076edc.8.2017.06.02.06.54.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Jun 2017 06:54:57 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" Cc: Fabian Frederick , Ard Biesheuvel , linux-kernel@vger.kernel.org, Kweh Hock Leong , Matt Fleming Subject: [PATCH 07/13] efi/capsule: Remove NULL test on kmap() Date: Fri, 2 Jun 2017 13:52:01 +0000 Message-Id: <20170602135207.21708-8-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: Fabian Frederick kmap() can't fail. Signed-off-by: Fabian Frederick Cc: Ard Biesheuvel Cc: Kweh Hock Leong Signed-off-by: Matt Fleming Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/capsule-loader.c | 4 ---- drivers/firmware/efi/capsule.c | 4 ---- 2 files changed, 8 deletions(-) -- 2.9.3 diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c index 5b012a467d7d..2357bcdcb44d 100644 --- a/drivers/firmware/efi/capsule-loader.c +++ b/drivers/firmware/efi/capsule-loader.c @@ -170,10 +170,6 @@ static ssize_t efi_capsule_write(struct file *file, const char __user *buff, page = cap_info->pages[cap_info->index - 1]; kbuff = kmap(page); - if (!kbuff) { - ret = -ENOMEM; - goto failed; - } kbuff += PAGE_SIZE - cap_info->page_bytes_remain; /* Copy capsule binary data from user space to kernel space buffer */ diff --git a/drivers/firmware/efi/capsule.c b/drivers/firmware/efi/capsule.c index 6eedff45e6d7..e603ccf39d80 100644 --- a/drivers/firmware/efi/capsule.c +++ b/drivers/firmware/efi/capsule.c @@ -247,10 +247,6 @@ int efi_capsule_update(efi_capsule_header_t *capsule, struct page **pages) efi_capsule_block_desc_t *sglist; sglist = kmap(sg_pages[i]); - if (!sglist) { - rv = -ENOMEM; - goto out; - } for (j = 0; j < SGLIST_PER_PAGE && count > 0; j++) { u64 sz = min_t(u64, imagesize, PAGE_SIZE);