From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752521AbdFERR4 (ORCPT ); Mon, 5 Jun 2017 13:17:56 -0400 Received: from terminus.zytor.com ([65.50.211.136]:40935 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751940AbdFERRx (ORCPT ); Mon, 5 Jun 2017 13:17:53 -0400 Date: Mon, 5 Jun 2017 10:13:12 -0700 From: tip-bot for Fabian Frederick Message-ID: Cc: peterz@infradead.org, matt@codeblueprint.co.uk, ard.biesheuvel@linaro.org, hock.leong.kweh@intel.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, fabf@skynet.be, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org Reply-To: mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, fabf@skynet.be, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, ard.biesheuvel@linaro.org, hock.leong.kweh@intel.com, matt@codeblueprint.co.uk, peterz@infradead.org In-Reply-To: <20170602135207.21708-8-ard.biesheuvel@linaro.org> References: <20170602135207.21708-8-ard.biesheuvel@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] efi/capsule: Remove NULL test on kmap() Git-Commit-ID: 171fd0222957abe28e6d78de667f457376f45cf1 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: 171fd0222957abe28e6d78de667f457376f45cf1 Gitweb: http://git.kernel.org/tip/171fd0222957abe28e6d78de667f457376f45cf1 Author: Fabian Frederick AuthorDate: Fri, 2 Jun 2017 13:52:01 +0000 Committer: Ingo Molnar CommitDate: Mon, 5 Jun 2017 17:50:40 +0200 efi/capsule: Remove NULL test on kmap() kmap() can't fail. Signed-off-by: Fabian Frederick Signed-off-by: Matt Fleming Signed-off-by: Ard Biesheuvel Cc: Kweh Hock Leong Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/20170602135207.21708-8-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar --- drivers/firmware/efi/capsule-loader.c | 4 ---- drivers/firmware/efi/capsule.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c index 5b012a4..2357bcd 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 6eedff4..e603ccf 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);