From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 E8D1A30F7EA for ; Wed, 29 Jul 2026 02:30:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785292229; cv=none; b=G5lA1N8+FJ9zlC8+QQiMtlFlsAhDrPhL6o9QQKoa2YiULjC+3mS6s9/n15qemsp/+0hPzQqiKrZ0NvXVn9okpl/+S8YmaBZ+epVCCKQueKCbkmdgneqh94PzuUSMvc5UMnxksLDNcXkVRRq1iT1Mt+YJv0oE+1VKnn3EV0ME+Gg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785292229; c=relaxed/simple; bh=t3zUMrjSEcbDF9wMn8BjWrhYZcQmTOArbQ2FlN4cD7k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GDbQoyIDMY+zYHrtBa1bSQhsSJdK3JYc1ZGzXLOyAkEzmcLmJqSAihuQiIXV4h8Q+KKNU5KnkYOHLTZtg5ypC0WJYQtTfXzeuhKY6AnYaW2hZX3nl0CPbTaNJY0ByuKJRutd1G/+xF8AN3ZUgYuJkG5TuFJPlJPt3EG0UE/rYpU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gX1gWT3w; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gX1gWT3w" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0ABA51F000E9; Wed, 29 Jul 2026 02:30:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785292227; bh=4/lZW4aFs+D51h/kM5neAXcaXW2itVua9wAuxjz/W/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gX1gWT3w6g+wsQSlmUaOLQ8Qvz2W3UCoqSTdG8aRsMWgrfNCzWeWhJZoE+RbdJ71l Ep2Dh67uIgAvZBrM6Pu8nLAHesRk7cvvRLLW3FqH1mvh0Sh3eo6K6ednBdOzaEOPTq uoiXsvC14f2/Ar9xw+WssapwrcVZ5D4dzSBsBa7bC4q6+8U/eqMAJDpzm2oHBPslbj CvJKVjX6pv3n3sGmRtC/Y9fi6DSfn0J8XhCBQZJOfql4g/8iqUzTtVh28gtOSxfHRD Yq9bOdPzA7PZrXvIAGsaBq+o0xgfkJGFdfjt/GonqxUpJJ2qyysjHNnc4z4jYBoSfQ UDWohU/vEjSzw== From: Sasha Levin To: stable@vger.kernel.org Cc: Haoxiang Li , Larysa Zaremba , Alex Elder , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18.y] net: ipa: fix SMEM state handle leaks in SMP2P init Date: Tue, 28 Jul 2026 22:30:25 -0400 Message-ID: <20260729023025.1114440-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026072132-chatroom-aware-b80e@gregkh> References: <2026072132-chatroom-aware-b80e@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Haoxiang Li [ Upstream commit 96ca1e658ae459276292bd6d971ab5d8c7e0379a ] ipa_smp2p_init() acquires two Qualcomm SMEM state handles with qcom_smem_state_get(). However, neither the init error paths nor ipa_smp2p_exit() release them. Release both handles with qcom_smem_state_put() in the init error paths and in ipa_smp2p_exit(). Fixes: 530f9216a953 ("soc: qcom: ipa: AP/modem communications") Cc: stable@vger.kernel.org Signed-off-by: Haoxiang Li Reviewed-by: Larysa Zaremba Reviewed-by: Alex Elder Link: https://patch.msgid.link/20260624065955.2822765-1-haoxiang_li2024@163.com Signed-off-by: Jakub Kicinski [ kzalloc_obj() context line kept as kzalloc(sizeof(*smp2p), GFP_KERNEL) since ipa_smp2p.c was not yet converted in this tree ] Signed-off-by: Sasha Levin --- drivers/net/ipa/ipa_smp2p.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/drivers/net/ipa/ipa_smp2p.c b/drivers/net/ipa/ipa_smp2p.c index fcaadd111a8a30..0c184f6f91c6f2 100644 --- a/drivers/net/ipa/ipa_smp2p.c +++ b/drivers/net/ipa/ipa_smp2p.c @@ -234,19 +234,27 @@ ipa_smp2p_init(struct ipa *ipa, struct platform_device *pdev, bool modem_init) &valid_bit); if (IS_ERR(valid_state)) return PTR_ERR(valid_state); - if (valid_bit >= 32) /* BITS_PER_U32 */ - return -EINVAL; + if (valid_bit >= 32) { /* BITS_PER_U32 */ + ret = -EINVAL; + goto err_valid_state_put; + } enabled_state = qcom_smem_state_get(dev, "ipa-clock-enabled", &enabled_bit); - if (IS_ERR(enabled_state)) - return PTR_ERR(enabled_state); - if (enabled_bit >= 32) /* BITS_PER_U32 */ - return -EINVAL; + if (IS_ERR(enabled_state)) { + ret = PTR_ERR(enabled_state); + goto err_valid_state_put; + } + if (enabled_bit >= 32) { /* BITS_PER_U32 */ + ret = -EINVAL; + goto err_enabled_state_put; + } smp2p = kzalloc(sizeof(*smp2p), GFP_KERNEL); - if (!smp2p) - return -ENOMEM; + if (!smp2p) { + ret = -ENOMEM; + goto err_enabled_state_put; + } smp2p->ipa = ipa; @@ -291,6 +299,10 @@ ipa_smp2p_init(struct ipa *ipa, struct platform_device *pdev, bool modem_init) ipa->smp2p = NULL; mutex_destroy(&smp2p->mutex); kfree(smp2p); +err_enabled_state_put: + qcom_smem_state_put(enabled_state); +err_valid_state_put: + qcom_smem_state_put(valid_state); return ret; } @@ -307,6 +319,8 @@ void ipa_smp2p_exit(struct ipa *ipa) ipa_smp2p_power_release(ipa); ipa->smp2p = NULL; mutex_destroy(&smp2p->mutex); + qcom_smem_state_put(smp2p->enabled_state); + qcom_smem_state_put(smp2p->valid_state); kfree(smp2p); } -- 2.53.0