From patchwork Mon Mar 6 01:22:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongliang Mu X-Patchwork-Id: 64386 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1609599wrd; Sun, 5 Mar 2023 17:47:26 -0800 (PST) X-Google-Smtp-Source: AK7set8RSae9IbN+vIQiH3967G4Ex0cqCmhMC9kQL/jzG+Z4GLcs4WnZP6WYo+HDQfy5l+oZe4fH X-Received: by 2002:a17:90b:3891:b0:234:7ccf:3c7c with SMTP id mu17-20020a17090b389100b002347ccf3c7cmr9326348pjb.9.1678067245762; Sun, 05 Mar 2023 17:47:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678067245; cv=none; d=google.com; s=arc-20160816; b=EANui4v6Oed4JRfaBt9hqjoGhDxYtCW0qGYWBoPAtgAoKIDjZQLSq4dE9v5HTxiEKy mQC3EGJd2rpx+LWDETfIDatQlzxUs8GDJMhYfB8/LwsZ869W8GsFh+JvQ1F1wdECkxf1 1fc0bzK01kd8T5ZU1FcTGVbt/BgCSkgCTELJjvG9jxB0m0hqzwjM0o7NM9qTna4sLZcb ymo86s8wd8cia0tXmY1/CSj3gGjagysC1k9dqq63ao9uIMZoH89ju2AH5DkFH/FBm+/D P7GUtoCK4nalTlHDrTKsYTWVmWMPadiexC3jGas/l69F5LGHSRjJrXct8JZ3BwafYiDs dWZg== 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=P0AOF7xozr/kfaVcXr/ZaPXiOQM0jfQJllYFGnFj0Go=; b=DovTsB3boVXqbsPm4omENqIdnt9IRBYpc2N998vEuoeoK70jR+9lxv/s+YhsmVKjmB 9V4I15pnwdgZy15EyPsw7+PzO452M4lDwfLIR6wDeu4oJGDuONcFlgBhOQzupmx/dGn3 4ZUHO1CePljsr2cAa58D3djqNaH7dn0i6UPX0t+HQwNMN92GCGkW2CuBWMmZ2EEgNCmf dwJx3FLHYTm1ebHUd64/leIgBz3hZZx9fxskvIJy8zsVXpYZp1qzBIDnYGZrGk7QwJGt d8n4NzjNwHlZXWWlTAn/hKcZjuNZzr0GTVgLtVstRSHRrNIvMgL58nIf6NBFkhMLu+YH Oyhw== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c35-20020a630d23000000b005074669ce19si1382416pgl.673.2023.03.05.17.47.13; Sun, 05 Mar 2023 17:47:25 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229567AbjCFBY6 (ORCPT + 99 others); Sun, 5 Mar 2023 20:24:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229484AbjCFBY4 (ORCPT ); Sun, 5 Mar 2023 20:24:56 -0500 Received: from hust.edu.cn (unknown [202.114.0.240]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99661EB70 for ; Sun, 5 Mar 2023 17:24:55 -0800 (PST) Received: from localhost.localdomain ([172.16.0.254]) (user=dzm91@hust.edu.cn mech=LOGIN bits=0) by mx1.hust.edu.cn with ESMTP id 3261OaYh027380-3261OaYk027380 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 6 Mar 2023 09:24:41 +0800 From: Dongliang Mu To: Yinbo Zhu Cc: Dongliang Mu , loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] drivers: loongson: fix memory leak in loongson2_guts_probe/remove Date: Mon, 6 Mar 2023 09:22:00 +0800 Message-Id: <20230306012201.242413-1-dzm91@hust.edu.cn> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-FEAS-AUTH-USER: dzm91@hust.edu.cn X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, 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?1759581040374582706?= X-GMAIL-MSGID: =?utf-8?q?1759581040374582706?= drivers/soc/loongson/loongson2_guts.c:150 loongson2_guts_probe() warn: 'guts->regs' from ioremap() not released on lines: 131,135,139,143. Fix this by invoking iounmap() in the error handling code and the remove function. Note that, this patch is not tested due to the loongson architecture. Signed-off-by: Dongliang Mu --- drivers/soc/loongson/loongson2_guts.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/soc/loongson/loongson2_guts.c b/drivers/soc/loongson/loongson2_guts.c index bace4bc8e03b..ba330adb555c 100644 --- a/drivers/soc/loongson/loongson2_guts.c +++ b/drivers/soc/loongson/loongson2_guts.c @@ -98,6 +98,7 @@ static int loongson2_guts_probe(struct platform_device *pdev) const struct loongson2_soc_die_attr *soc_die; const char *machine; u32 svr; + int rc = -ENOMEM; /* Initialize guts */ guts = devm_kzalloc(dev, sizeof(*guts), GFP_KERNEL); @@ -128,19 +129,21 @@ static int loongson2_guts_probe(struct platform_device *pdev) soc_dev_attr.family = devm_kasprintf(dev, GFP_KERNEL, "Loongson"); } if (!soc_dev_attr.family) - return -ENOMEM; + goto iounmap; soc_dev_attr.soc_id = devm_kasprintf(dev, GFP_KERNEL, "svr:0x%08x", svr); if (!soc_dev_attr.soc_id) - return -ENOMEM; + goto iounmap; soc_dev_attr.revision = devm_kasprintf(dev, GFP_KERNEL, "%d.%d", (svr >> 4) & 0xf, svr & 0xf); if (!soc_dev_attr.revision) - return -ENOMEM; + goto iounmap; soc_dev = soc_device_register(&soc_dev_attr); - if (IS_ERR(soc_dev)) - return PTR_ERR(soc_dev); + if (IS_ERR(soc_dev)) { + rc = PTR_ERR(soc_dev); + goto iounmap; + } pr_info("Machine: %s\n", soc_dev_attr.machine); pr_info("SoC family: %s\n", soc_dev_attr.family); @@ -148,11 +151,16 @@ static int loongson2_guts_probe(struct platform_device *pdev) soc_dev_attr.soc_id, soc_dev_attr.revision); return 0; + +iounmap: + iounmap(guts->regs); + return rc; } static int loongson2_guts_remove(struct platform_device *dev) { soc_device_unregister(soc_dev); + iounmap(guts->regs); return 0; }