From nobody Tue Jun 23 21:31:39 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77AABC433F5 for ; Sat, 26 Feb 2022 09:27:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230419AbiBZJ2S (ORCPT ); Sat, 26 Feb 2022 04:28:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229877AbiBZJ2L (ORCPT ); Sat, 26 Feb 2022 04:28:11 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA0A8443F8; Sat, 26 Feb 2022 01:27:29 -0800 (PST) Received: from canpemm500009.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4K5Lmr4Y5Xz9sJF; Sat, 26 Feb 2022 17:23:56 +0800 (CST) Received: from localhost.localdomain (10.175.102.38) by canpemm500009.china.huawei.com (7.192.105.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Sat, 26 Feb 2022 17:27:26 +0800 From: Wei Yongjun To: , Theodore Ts'o , "Jason A. Donenfeld" CC: , , Hulk Robot Subject: [PATCH -next] virt: vmgenid: fix return value check in vmgenid_acpi_add() Date: Sat, 26 Feb 2022 09:43:31 +0000 Message-ID: <20220226094331.3268683-1-weiyongjun1@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.102.38] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To canpemm500009.china.huawei.com (7.192.105.203) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In case of error, the function devm_memremap() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: d54207b61470 ("virt: vmgenid: introduce driver for reinitializing RN= G on VM fork") Reported-by: Hulk Robot Signed-off-by: Wei Yongjun --- drivers/virt/vmgenid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/virt/vmgenid.c b/drivers/virt/vmgenid.c index b503c210c2d7..344f6fcc01da 100644 --- a/drivers/virt/vmgenid.c +++ b/drivers/virt/vmgenid.c @@ -50,8 +50,8 @@ static int vmgenid_acpi_add(struct acpi_device *device) phys_addr =3D (obj->package.elements[0].integer.value << 0) | (obj->package.elements[1].integer.value << 32); state->next_id =3D devm_memremap(&device->dev, phys_addr, VMGENID_SIZE, M= EMREMAP_WB); - if (!state->next_id) { - ret =3D -ENOMEM; + if (IS_ERR(state->next_id)) { + ret =3D PTR_ERR(state->next_id); goto out; }