From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 401C325A357; Wed, 25 Feb 2026 01:44:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771983866; cv=none; b=cRjaGnV7a6kI7/Gv/i2Gk65xnORxIs17J7Ksg6NTTHub5nndh38OvYNFvorGTTJTXEcFtr+QFDK99w1ezLzt9aPDUKoere914NtoZC/tv1zRw9dFaS31vvR1sbLMmhoYnRWzt2uB/vT9PwuS4meRBDxn81myMOC2w2LPDxeYTKQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771983866; c=relaxed/simple; bh=lxlNbfaeAcR4Ra7O3ocG3tgehzC8UA6RKNO9Q8kMPOg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rPojsEYMyp1zdCPaxg1U76qsnzFPN/CNr4JZQWw5XswoombGG+FEhKL5SkytXGWjDUTqUukEs9xyMoO16/bBl4ObK7q9rHj7Xda1OuABsIhkHhW/0TeJoke1nh+FcW/za9FI2PyCxCZj6TyOW7JvjISqQI/r9gI3RrjtBraSQx8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BEEgPQZJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="BEEgPQZJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3AD6C116D0; Wed, 25 Feb 2026 01:44:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1771983866; bh=lxlNbfaeAcR4Ra7O3ocG3tgehzC8UA6RKNO9Q8kMPOg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BEEgPQZJZ5uVhzkTe8lXG8eEt1wEswvGf34n75i7lOIlqPPmPbj4pevx4xzk246WM bGcHZc+DqTmQMFpYdn+uCpk2kOmURIw2qtsaFipwdW76C21ssDSF/OKoWQXWQqObL3 CaN7BRLl4ZlyqacOzhztVYHbAuUTrT0jWFKBhQ2E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dmitry Baryshkov , Haotian Zhang , Bjorn Andersson , Sasha Levin Subject: [PATCH 6.18 143/641] soc: qcom: cmd-db: Use devm_memremap() to fix memory leak in cmd_db_dev_probe Date: Tue, 24 Feb 2026 17:17:49 -0800 Message-ID: <20260225012352.581044636@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260225012348.915798704@linuxfoundation.org> References: <20260225012348.915798704@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Haotian Zhang [ Upstream commit 0da7824734d8d83e6a844dd0207f071cb0c50cf4 ] If cmd_db_magic_matches() fails after memremap() succeeds, the function returns -EINVAL without unmapping the memory region, causing a potential resource leak. Switch to devm_memremap to automatically manage the map resource. Fixes: 312416d9171a ("drivers: qcom: add command DB driver") Suggested-by: Dmitry Baryshkov Signed-off-by: Haotian Zhang Link: https://lore.kernel.org/r/20251216013933.773-1-vulab@iscas.ac.cn Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/soc/qcom/cmd-db.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/soc/qcom/cmd-db.c b/drivers/soc/qcom/cmd-db.c index ae66c2623d250..84a75d8c4b702 100644 --- a/drivers/soc/qcom/cmd-db.c +++ b/drivers/soc/qcom/cmd-db.c @@ -349,15 +349,16 @@ static int cmd_db_dev_probe(struct platform_device *pdev) return -EINVAL; } - cmd_db_header = memremap(rmem->base, rmem->size, MEMREMAP_WC); - if (!cmd_db_header) { - ret = -ENOMEM; + cmd_db_header = devm_memremap(&pdev->dev, rmem->base, rmem->size, MEMREMAP_WC); + if (IS_ERR(cmd_db_header)) { + ret = PTR_ERR(cmd_db_header); cmd_db_header = NULL; return ret; } if (!cmd_db_magic_matches(cmd_db_header)) { dev_err(&pdev->dev, "Invalid Command DB Magic\n"); + cmd_db_header = NULL; return -EINVAL; } -- 2.51.0