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 EE4A92139C9; Thu, 28 May 2026 20:38:45 +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=1780000727; cv=none; b=KWNwMRxy/Frb0OlPu5u+ZQMfFvH0/YqmMFhruo+JQtzVRw+1mT2hVb2PNn7hXfL9vrc48MgHgJeiXM36wSNU1gEWEr75OogC1c8lKnqnaxKZFQcn96V/8UxyT9NhItvEbwB1mYg/cJPdtAZqz0WKr2aj0V6RmL/E6GjgQSq/2Fc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780000727; c=relaxed/simple; bh=ZmmX903zFTmLs+kKYrynWh7bfcTw0BSA6QNI600Rcvk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u75oyDD6LrRd4s3UNu4rrMOv5mPukyKnIaw/MQDKusN8aoalaiPbAG67FAuXKDUQ5msQrh2Wd5Ib0nRqq4JFFrbR7VntsCMQfZ9VazINLjxh1XkEFE8r33c2rE/0xjjGWnqMQMimY64FiYXgULXzW72uCxfECgFqHy3VI8ghPVo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=qU2s+TE3; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="qU2s+TE3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38FD61F000E9; Thu, 28 May 2026 20:38:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780000725; bh=fSazEKKquhYJac3KPiXiXXbjDddtx6lUbPGkfPNSMH4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qU2s+TE3Mr0Xa/NFj8XtJkkaSjPXz8nJbimQmUyOso0b0w13SlMkp8NOq8DWmLEmz LyBa/YEkC/nv/c0ouTX9x6D6po62GEqU0ko+Ic06vODvob7o78chJLBGEqKSkJErP6 vP0EHF7h2O42ikLcBl+tcffvCR/wXmzxo+0nSyyg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sudeep Holla , Sasha Levin Subject: [PATCH 6.12 147/272] firmware: arm_ffa: Skip free_pages on RX buffer alloc failure Date: Thu, 28 May 2026 21:48:41 +0200 Message-ID: <20260528194633.487793174@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194629.379955525@linuxfoundation.org> References: <20260528194629.379955525@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sudeep Holla [ Upstream commit 09527e2c534911619d7e098729711100290bc3e1 ] If the RX buffer allocation fails in ffa_init(), the error path jumps to free_pages even though no buffer has been allocated yet. Route that case directly to free_drv_info so the cleanup path is only used after at least one RX/TX buffer allocation has succeeded. Fixes: 3bbfe9871005 ("firmware: arm_ffa: Add initial Arm FFA driver support") Link: https://patch.msgid.link/20260428-ffa_fixes-v2-2-8595ae450034@kernel.org Signed-off-by: Sudeep Holla Signed-off-by: Sasha Levin --- drivers/firmware/arm_ffa/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c index 15e71a53956e2..61d4a4b7d97b6 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -1793,7 +1793,7 @@ static int __init ffa_init(void) drv_info->rx_buffer = alloc_pages_exact(rxtx_bufsz, GFP_KERNEL); if (!drv_info->rx_buffer) { ret = -ENOMEM; - goto free_pages; + goto free_drv_info; } drv_info->tx_buffer = alloc_pages_exact(rxtx_bufsz, GFP_KERNEL); -- 2.53.0