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 A2F7B86334; Sat, 30 May 2026 18:45:41 +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=1780166742; cv=none; b=aPhz3gfi5CpusEVHG9RGv/ywPcmDpIgZ++bPdn8Ai+AB5Qfc3UDTWEbhyg9GWSgRAIBByCTzJZi8o6xsrZZd+HNLJMPBnZOS7O+RWSF54pE04Q5DFq5kwxHPc4/caD4MOtZQfcEly+ucTP16Wu2pUywy7ikchvrO+rgopHTMtqQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780166742; c=relaxed/simple; bh=twhPtw7ApDY5YNeKCUmiMRo9Q3Y+NOtzjrStwdS9Ghg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tlJNKyEpJ0anNeXSHh2QOP33f/8dQV0p5Q/LFBZAc1et6b5qIuK/rPzixHM9DD/PQ51J9Utf/MDBKm5u7g4Kl8js44ckEo/KRa++qUsNBT2LqbuX2h3Gkvu6WY0TFnokANKKmixeUhJu2V9IScdha/NlgKSIRYia5h2ZdDbPYhQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=qGdA1+jZ; 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="qGdA1+jZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE5771F00893; Sat, 30 May 2026 18:45:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780166741; bh=jTGe0CYGwZJmhHAl/cqNuDZ4rdPmbZRCepggZ37KN70=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qGdA1+jZ8umvqO3ujvJdXd+e5XiLITJUtUx+kdCZznNbHaoaTSl98TyBdbh679LIG 8VUrgICEdvCzeNHIGgXUHmGFAF3HQJgDXTFe0Tw5wd01yEyY9YNJWfpyR7SFYlmaux MvGdCAU2xwsV+iQvYWtCwSUYmPHR/cNAAklaPjQs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wolfram Sang , Jassi Brar , Sasha Levin Subject: [PATCH 5.10 457/589] mailbox: mailbox-test: free channels on probe error Date: Sat, 30 May 2026 18:05:38 +0200 Message-ID: <20260530160236.691260240@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160224.570625122@linuxfoundation.org> References: <20260530160224.570625122@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 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wolfram Sang [ Upstream commit c02053a9055d5fdfd32432287cca8958db1d5bc5 ] On probe error, free the previously obtained channels. This not only prevents a leak, but also UAF scenarios because the client structure will be removed nonetheless because it was allocated with devm. Link: https://sashiko.dev/#/patchset/20260327151217.5327-2-wsa%2Brenesas%40sang-engineering.com Fixes: 8ea4484d0c2b ("mailbox: Add generic mechanism for testing Mailbox Controllers") Signed-off-by: Wolfram Sang Signed-off-by: Jassi Brar Signed-off-by: Sasha Levin --- drivers/mailbox/mailbox-test.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/mailbox/mailbox-test.c b/drivers/mailbox/mailbox-test.c index 29c04157b5e88..1d546cae922ce 100644 --- a/drivers/mailbox/mailbox-test.c +++ b/drivers/mailbox/mailbox-test.c @@ -405,18 +405,27 @@ static int mbox_test_probe(struct platform_device *pdev) if (tdev->rx_channel) { tdev->rx_buffer = devm_kzalloc(&pdev->dev, MBOX_MAX_MSG_LEN, GFP_KERNEL); - if (!tdev->rx_buffer) - return -ENOMEM; + if (!tdev->rx_buffer) { + ret = -ENOMEM; + goto err_free_chans; + } } ret = mbox_test_add_debugfs(pdev, tdev); if (ret) - return ret; + goto err_free_chans; init_waitqueue_head(&tdev->waitq); dev_info(&pdev->dev, "Successfully registered\n"); return 0; + +err_free_chans: + if (tdev->tx_channel) + mbox_free_channel(tdev->tx_channel); + if (tdev->rx_channel) + mbox_free_channel(tdev->rx_channel); + return ret; } static int mbox_test_remove(struct platform_device *pdev) -- 2.53.0