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 5DDFD20EB; Mon, 14 Oct 2024 14:39:10 +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=1728916750; cv=none; b=FxT/vFl2FDFXuzg9J+uVwdwreW2ugF2o65GR2B+4sNKTfw5Zf9APyFCKH51H62SLBMOLTggxFFWOR+y4/exP7IRrlcAe6Fe0wgpD/NrLm0gY1xicvVdS6b8kx1Y+TL/KO2ABDnEjgV0hM9z8mcS1aIRHO/G2/3dgdRIOnoGImVU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728916750; c=relaxed/simple; bh=R7QyqZXTYu0bMiIvirWNEOCgikeelxlJEffLidfx/5k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZFzH9B4GomZeSDvl2Ilw0uTdiHgF1TglAS6MISZ66BU6jozrlUz00vtxcJLFssifajxCikQrSgYmS4DA6Cd7DEeD5u5CHFASPBPjbxzmfmQv7Ois0DtjrweQhMwkYn88I3fqMkIORfsG/eRpZUgcOVnEpXy8UEkgybNr5hzKwjk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=y5d+xJRr; 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="y5d+xJRr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C815AC4CEC3; Mon, 14 Oct 2024 14:39:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728916750; bh=R7QyqZXTYu0bMiIvirWNEOCgikeelxlJEffLidfx/5k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y5d+xJRrhr0uVGJe9kROF3fypgMNLab2/r26yLRsTphNQqbyS9mQuQgiIOaLZqNFA y6MdLECBZSOp7PNtw7w5Ngpvclff+AQ2PcILDpoy8cmwapdv2zlhU+DG7M7Ik4oDH1 HWSJiV8EKkJ2AgIKv5yDRa6WsWi6Fq17AVNpKmbo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Torsten Hilbrich , Mathias Krause , Dmitry Torokhov , Tzung-Bi Shih , Sasha Levin Subject: [PATCH 6.6 055/213] Input: synaptics-rmi4 - fix UAF of IRQ domain on driver removal Date: Mon, 14 Oct 2024 16:19:21 +0200 Message-ID: <20241014141045.138693038@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141042.954319779@linuxfoundation.org> References: <20241014141042.954319779@linuxfoundation.org> User-Agent: quilt/0.67 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mathias Krause commit fbf8d71742557abaf558d8efb96742d442720cc2 upstream. Calling irq_domain_remove() will lead to freeing the IRQ domain prematurely. The domain is still referenced and will be attempted to get used via rmi_free_function_list() -> rmi_unregister_function() -> irq_dispose_mapping() -> irq_get_irq_data()'s ->domain pointer. With PaX's MEMORY_SANITIZE this will lead to an access fault when attempting to dereference embedded pointers, as in Torsten's report that was faulting on the 'domain->ops->unmap' test. Fix this by releasing the IRQ domain only after all related IRQs have been deactivated. Fixes: 24d28e4f1271 ("Input: synaptics-rmi4 - convert irq distribution to irq_domain") Reported-by: Torsten Hilbrich Signed-off-by: Mathias Krause Link: https://lore.kernel.org/r/20240222142654.856566-1-minipli@grsecurity.net Signed-off-by: Dmitry Torokhov Signed-off-by: Tzung-Bi Shih Signed-off-by: Sasha Levin --- drivers/input/rmi4/rmi_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c index aa32371f04af6..ef9ea295f9e03 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -978,12 +978,12 @@ static int rmi_driver_remove(struct device *dev) rmi_disable_irq(rmi_dev, false); - irq_domain_remove(data->irqdomain); - data->irqdomain = NULL; - rmi_f34_remove_sysfs(rmi_dev); rmi_free_function_list(rmi_dev); + irq_domain_remove(data->irqdomain); + data->irqdomain = NULL; + return 0; } -- 2.43.0