From patchwork Wed Nov 2 03:25:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 14010 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp3368680wru; Tue, 1 Nov 2022 20:28:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7pzQ30xB4udBJiCgfiX3M3mgrofAYGIRUqYxB+Kh33T4hRQoJXjm112lC7ql7qrtNfHFMi X-Received: by 2002:a17:902:c612:b0:186:8376:208d with SMTP id r18-20020a170902c61200b001868376208dmr22619425plr.89.1667359693254; Tue, 01 Nov 2022 20:28:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667359693; cv=none; d=google.com; s=arc-20160816; b=Hadx8KX/Y2RAkMJ4GFDJ00Zl6dpSzPm+dQq/9EPmevj5kbLHQDamlwaJ8vcekEEDVg TOVRuV6agzFgWRuyR1QtA24+kAoelbGUsqx09WiVOLQ6gA/DO+s8yx38mw+hzGFMFr4S 92dABSQPbjH8pBrGVRRJi6X0DPRjR6qWvyL6WNsoSKhdPvbU95Rn0JN9J825FMxlK6l/ NFXwl/srV7/w25sd0/nN0VMqX3W1M+QhV6d5k2Zy9HqD4IWnLjmv0XNodPmok5DYkEqE Pft26g3NAcH4qmZEss0EqeSqM4PKcDyrLBHbI6g2KlHvJenx4EeKk38o/zhFvsZmA9cH LhjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=GTJh37ERKCt8NG2czPP2D5gqVOX5YMen3Q5IOItgDt4=; b=WXN53UroreyVuzB7PO8wCteoeCsXmIjyH1Yj7oPrXpSEmjG7WYL5WBamMu77qE8X4M MRqfL7TfjcaaPT52UhEENwenRJWDTrDeL59u+dMZ3DCdL6wR89O4Pt8KBBofrdFeZKsr sG8+GE/iWGsMIZsVD0yHWHhGiuGvW3peGnz69SRO0Vv181sYdk6KPZ16qokX1TAPeTle o1XKj+D5UVJKoDR+i2hds22239p9ZsPLBKRkv63f1vc4NzBWTq8N7jRVDsTfaj+H+N9K XmPetNi58E9JIBwmv2eJ+D7WwnyakQp5EE1MDknhYGyYwDZwcyDVGJPhzsbS3InHHhWm Yj9g== 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 a22-20020a631a16000000b00439c930538csi14707180pga.85.2022.11.01.20.27.58; Tue, 01 Nov 2022 20:28:13 -0700 (PDT) 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 S230497AbiKBD1e (ORCPT + 99 others); Tue, 1 Nov 2022 23:27:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230495AbiKBD1d (ORCPT ); Tue, 1 Nov 2022 23:27:33 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65F0B25EB6 for ; Tue, 1 Nov 2022 20:27:30 -0700 (PDT) Received: from dggpemm500022.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N2Byv2sdyzRnwW; Wed, 2 Nov 2022 11:22:31 +0800 (CST) Received: from dggpemm500007.china.huawei.com (7.185.36.183) by dggpemm500022.china.huawei.com (7.185.36.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 2 Nov 2022 11:27:28 +0800 Received: from huawei.com (10.175.103.91) by dggpemm500007.china.huawei.com (7.185.36.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 2 Nov 2022 11:27:28 +0800 From: Yang Yingliang To: CC: Wei Yongjun , Srinivas Kandagatla , Nicolas Saenz Julienne , Yang Yingliang Subject: [PATCH RESEND] nvmem: Fix return value check in rmem_read() Date: Wed, 2 Nov 2022 11:25:23 +0800 Message-ID: <20221102032523.1488171-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500007.china.huawei.com (7.185.36.183) 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?1748353357564558595?= X-GMAIL-MSGID: =?utf-8?q?1748353357564558595?= From: Wei Yongjun In case of error, the function memremap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Fixes: 5a3fa75a4d9c ("nvmem: Add driver to expose reserved memory as nvmem") Cc: Srinivas Kandagatla Cc: Nicolas Saenz Julienne Signed-off-by: Wei Yongjun Acked-by: Nicolas Saenz Julienne Signed-off-by: Yang Yingliang --- The previous patch link: https://lore.kernel.org/all/2fff7c82d983baccb91c4a1c0891a9b6cdc50dd6.camel@suse.de/T/ --- drivers/nvmem/rmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nvmem/rmem.c b/drivers/nvmem/rmem.c index b11c3c974b3d..80cb187f1481 100644 --- a/drivers/nvmem/rmem.c +++ b/drivers/nvmem/rmem.c @@ -37,9 +37,9 @@ static int rmem_read(void *context, unsigned int offset, * but as of Dec 2020 this isn't possible on arm64. */ addr = memremap(priv->mem->base, available, MEMREMAP_WB); - if (IS_ERR(addr)) { + if (!addr) { dev_err(priv->dev, "Failed to remap memory region\n"); - return PTR_ERR(addr); + return -ENOMEM; } count = memory_read_from_buffer(val, bytes, &off, addr, available);