From patchwork Mon Nov 14 09:02:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hui Tang X-Patchwork-Id: 19631 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2056746wru; Mon, 14 Nov 2022 01:47:51 -0800 (PST) X-Google-Smtp-Source: AA0mqf7VPlAtSvAxT3xzqQYwqoGk407Zbepv7GWgKDxDPPRKDLcl1pEnyPD8KoSyDGZORyfdf/Fj X-Received: by 2002:a17:906:7ac6:b0:7ae:6746:f26b with SMTP id k6-20020a1709067ac600b007ae6746f26bmr9603584ejo.171.1668419271317; Mon, 14 Nov 2022 01:47:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668419271; cv=none; d=google.com; s=arc-20160816; b=sOfmTKkbYkfBK7pn+QKY95XRhHcCdO3QJV1alJ1QCXtjdvR7wLbigqokhfm9ogk3R2 OaaYYo4leDnsyrhxTdQznqLMIKPHLxQpgWWcRxkVDlT1J1LoBgK+nP/frhKG9yFHVEUP C+S+EdsObSz4TkGFZCrigrWVwqkvHKYBrABTRWqHVmj+BMtAIbFu3NVYQcnIOxU4zNgQ XqgMUcLheoGfdMdpwqt4dz00/UAppUN/ePfZitcRD9J5LUFCmi6ysevAU3y03IXsG1q9 QFgSevAJ3IvNRu9HtkQAu1ntj7VbIqBtDW4AvV9lTR6soJ+xwfdQXq9qUbJwN8MDxGlL /ZOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=PCXSPLBUXeVZyOdng/0+G4uh20VWcsVqWWlicvfi+Yw=; b=QiyVEO/FHzVYamHuO+04dlctkacx/9Gj5d5UruClvoc/pG14M4QgURau5qliuVowhU XIw3SeyvXHT4siaEfpNn8MvRsNHOX3ELpvvKD6TafWshtzni2K3yJZKLjdOq+qS0/lOG 0oXUI1F85STPKnN0TuudotVPmLiQJGivI1YroAnt53CL2TPpKcPdfU3zziQLVVWZBioq H5tSEfMb6bcIpKEiIC43xu+8Fc7qwmK+qMT/MLKaTUzNOZVyoCY/uSxPPBmVKp6GGUGW 8gJNvgrqT+jDqJNsNVNxN2MALVeu6bObOsr9EBMd+wlkZwff891qfbwhcEH+JA6PwqjB Stqw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g22-20020a056402321600b00461e122a4e4si8521483eda.314.2022.11.14.01.47.28; Mon, 14 Nov 2022 01:47:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236884AbiKNJHb (ORCPT + 99 others); Mon, 14 Nov 2022 04:07:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237082AbiKNJHS (ORCPT ); Mon, 14 Nov 2022 04:07:18 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C2851EADF for ; Mon, 14 Nov 2022 01:05:57 -0800 (PST) Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N9k123C7PzHw2t; Mon, 14 Nov 2022 17:05:26 +0800 (CST) Received: from kwepemm600005.china.huawei.com (7.193.23.191) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 14 Nov 2022 17:05:52 +0800 Received: from ubuntu1804.huawei.com (10.67.175.30) by kwepemm600005.china.huawei.com (7.193.23.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 14 Nov 2022 17:05:51 +0800 From: Hui Tang To: , , , CC: , , , Subject: [PATCH v2] mtd: lpddr2_nvm: Fix possible null-ptr-deref Date: Mon, 14 Nov 2022 17:02:40 +0800 Message-ID: <20221114090240.244172-1-tanghui20@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.67.175.30] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600005.china.huawei.com (7.193.23.191) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749464406003964164?= X-GMAIL-MSGID: =?utf-8?q?1749464406003964164?= It will cause null-ptr-deref when resource_size(add_range) invoked, if platform_get_resource() returns NULL. Fixes: 96ba9dd65788 ("mtd: lpddr: add driver for LPDDR2-NVM PCM memories") Signed-off-by: Hui Tang Acked-by: Uwe Kleine-König --- v1 -> v2: - replace IS_ERR(add_range) with !add_range - fix commit subject format --- drivers/mtd/lpddr/lpddr2_nvm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mtd/lpddr/lpddr2_nvm.c b/drivers/mtd/lpddr/lpddr2_nvm.c index 367e2d906de0..e71af4c49096 100644 --- a/drivers/mtd/lpddr/lpddr2_nvm.c +++ b/drivers/mtd/lpddr/lpddr2_nvm.c @@ -433,6 +433,8 @@ static int lpddr2_nvm_probe(struct platform_device *pdev) /* lpddr2_nvm address range */ add_range = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!add_range) + return -ENODEV; /* Populate map_info data structure */ *map = (struct map_info) {