From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A96CC04AB3 for ; Fri, 10 May 2019 02:54:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6530A2182B for ; Fri, 10 May 2019 02:54:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727050AbfEJCyO (ORCPT ); Thu, 9 May 2019 22:54:14 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:58084 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726864AbfEJCyJ (ORCPT ); Thu, 9 May 2019 22:54:09 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id E457EF57247D1671A9A1; Fri, 10 May 2019 10:54:06 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.439.0; Fri, 10 May 2019 10:53:57 +0800 From: Kefeng Wang To: CC: Kefeng Wang , Dmitry Torokhov , Miloslav Trmac , Wolfram Sang , , Hulk Robot Subject: [PATCH 2/3] Input: wistron_btns: avoid panic if ioreamp fails Date: Fri, 10 May 2019 11:03:19 +0800 Message-ID: <20190510030320.109154-2-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190510030320.109154-1-wangkefeng.wang@huawei.com> References: <20190510030320.109154-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If ioremap fails, NULL pointer dereference will happen and leading to a kernel panic when access the virtual address in check_signature(). Fix it by check the return value of ioremap. Cc: Dmitry Torokhov Cc: Miloslav Trmac Cc: Wolfram Sang Cc: linux-input@vger.kernel.org Reported-by: Hulk Robot Signed-off-by: Kefeng Wang --- drivers/input/misc/wistron_btns.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c index 43e67f546366..a82ec3d102b4 100644 --- a/drivers/input/misc/wistron_btns.c +++ b/drivers/input/misc/wistron_btns.c @@ -107,7 +107,10 @@ static int __init map_bios(void) ssize_t offset; u32 entry_point; - base = ioremap(0xF0000, 0x10000); /* Can't fail */ + base = ioremap(0xF0000, 0x10000); + if (!base) + return -ENOMEM; + offset = locate_wistron_bios(base); if (offset < 0) { printk(KERN_ERR "wistron_btns: BIOS entry point not found\n"); -- 2.20.1