Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1432721AbdDYSLM (ORCPT ); Tue, 25 Apr 2017 14:11:12 -0400 Received: from mailrelay105.isp.belgacom.be ([195.238.20.132]:26474 "EHLO mailrelay105.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1432700AbdDYSLB (ORCPT ); Tue, 25 Apr 2017 14:11:01 -0400 X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3A5u9PIhbtcqIu2y3RunL5j1H/LSx+4OfEezUN459i?= =?us-ascii?q?sYplN5qZpsWybnLW6fgltlLVR4KTs6sC0LWG9f24EUU7or+/81k6OKRWUBEEjc?= =?us-ascii?q?hE1ycBO+WiTXPBEfjxciYhF95DXlI2t1uyMExSBdqsLwaK+i76xXcoFx7+LQt4?= =?us-ascii?q?IPjuUs6X1pzvlrP6x5qGRgxUmHKTZb53LRO55VHUv9UKqYBlJqs7zgbEumFJff?= =?us-ascii?q?gQzmQuOFHFzDjm4cLl0pdp8i1W89w7+sJNS6TxfOxsQ7VSAhw9MHEz6dGtvxSV?= =?us-ascii?q?HljH3WcVTmhDykkAOAPC9hyvG86p6iY=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2DGAQCckP9Y/zfGs1tbHAELAQUBgmprJ?= =?us-ascii?q?4FGjm+RJQGVOoIPIYYDhBZAGAEBAQEBAQEBAQEBaiiCMwQBHQEEgmkvI4EaJBO?= =?us-ascii?q?KDxGsMTqEEIdChlOBXYsLgkoFiTOIKotkknkNkVeUGR84gQZDHRiEXQGCUD41h?= =?us-ascii?q?2eBTwEBAQ?= X-IPAS-Result: =?us-ascii?q?A2DGAQCckP9Y/zfGs1tbHAELAQUBgmprJ4FGjm+RJQGVOoI?= =?us-ascii?q?PIYYDhBZAGAEBAQEBAQEBAQEBaiiCMwQBHQEEgmkvI4EaJBOKDxGsMTqEEIdCh?= =?us-ascii?q?lOBXYsLgkoFiTOIKotkknkNkVeUGR84gQZDHRiEXQGCUD41h2eBTwEBAQ?= From: Fabian Frederick To: Matt Fleming Cc: Ard Biesheuvel , linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH 1/1 linux-next] efi/capsule: kmap() can't fail Date: Tue, 25 Apr 2017 20:10:51 +0200 Message-Id: <20170425181051.2187-1-fabf@skynet.be> X-Mailer: git-send-email 2.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1333 Lines: 41 Remove NULL test on kmap() Signed-off-by: Fabian Frederick --- drivers/firmware/efi/capsule-loader.c | 5 ----- drivers/firmware/efi/capsule.c | 4 ---- 2 files changed, 9 deletions(-) diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c index 9ae6c11..bf8b2ef 100644 --- a/drivers/firmware/efi/capsule-loader.c +++ b/drivers/firmware/efi/capsule-loader.c @@ -183,11 +183,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) { - pr_debug("%s: kmap() failed\n", __func__); - ret = -EFAULT; - 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); -- 2.9.3