stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Zheng Wang <zyytlz.wz@163.com>,
	Ulf Hansson <ulf.hansson@linaro.org>,
	Sasha Levin <sashal@kernel.org>,
	maximlevitsky@gmail.com, oakad@yahoo.com,
	linux-mmc@vger.kernel.org
Subject: [PATCH AUTOSEL 5.15 07/17] memstick: r592: Fix UAF bug in r592_remove due to race condition
Date: Sun, 30 Apr 2023 23:04:24 -0400	[thread overview]
Message-ID: <20230501030435.3254695-7-sashal@kernel.org> (raw)
In-Reply-To: <20230501030435.3254695-1-sashal@kernel.org>

From: Zheng Wang <zyytlz.wz@163.com>

[ Upstream commit 63264422785021704c39b38f65a78ab9e4a186d7 ]

In r592_probe, dev->detect_timer was bound with r592_detect_timer.
In r592_irq function, the timer function will be invoked by mod_timer.

If we remove the module which will call hantro_release to make cleanup,
there may be a unfinished work. The possible sequence is as follows,
which will cause a typical UAF bug.

Fix it by canceling the work before cleanup in r592_remove.

CPU0                  CPU1

                    |r592_detect_timer
r592_remove         |
  memstick_free_host|
  put_device;       |
  kfree(host);      |
                    |
                    | queue_work
                    |   &host->media_checker //use

Signed-off-by: Zheng Wang <zyytlz.wz@163.com>
Link: https://lore.kernel.org/r/20230307164338.1246287-1-zyytlz.wz@163.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/memstick/host/r592.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index 1d35d147552d4..42bfc46842b82 100644
--- a/drivers/memstick/host/r592.c
+++ b/drivers/memstick/host/r592.c
@@ -829,7 +829,7 @@ static void r592_remove(struct pci_dev *pdev)
 	/* Stop the processing thread.
 	That ensures that we won't take any more requests */
 	kthread_stop(dev->io_thread);
-
+	del_timer_sync(&dev->detect_timer);
 	r592_enable_device(dev, false);
 
 	while (!error && dev->req) {
-- 
2.39.2


  parent reply	other threads:[~2023-05-01  3:14 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-01  3:04 [PATCH AUTOSEL 5.15 01/17] drm/displayid: add displayid_get_header() and check bounds better Sasha Levin
2023-05-01  3:04 ` [PATCH AUTOSEL 5.15 02/17] drm/amd/display: Use DC_LOG_DC in the trasform pixel function Sasha Levin
2023-05-01  3:04 ` [PATCH AUTOSEL 5.15 03/17] regmap: cache: Return error in cache sync operations for REGCACHE_NONE Sasha Levin
2023-05-01  3:04 ` [PATCH AUTOSEL 5.15 04/17] arm64: dts: qcom: msm8996: Add missing DWC3 quirks Sasha Levin
2023-05-01  3:04 ` [PATCH AUTOSEL 5.15 05/17] media: cx23885: Fix a null-ptr-deref bug in buffer_prepare() and buffer_finish() Sasha Levin
2023-05-01  3:04 ` [PATCH AUTOSEL 5.15 06/17] media: pci: tw68: Fix null-ptr-deref bug in buf prepare and finish Sasha Levin
2023-05-01  3:04 ` Sasha Levin [this message]
2023-05-01  3:04 ` [PATCH AUTOSEL 5.15 08/17] firmware: arm_sdei: Fix sleep from invalid context BUG Sasha Levin
2023-05-01  3:04 ` [PATCH AUTOSEL 5.15 09/17] ACPI: EC: Fix oops when removing custom query handlers Sasha Levin
2023-05-01  3:04 ` [PATCH AUTOSEL 5.15 10/17] remoteproc: stm32_rproc: Add mutex protection for workqueue Sasha Levin
2023-05-01  3:04 ` [PATCH AUTOSEL 5.15 11/17] drm/tegra: Avoid potential 32-bit integer overflow Sasha Levin
2023-05-01  3:04 ` [PATCH AUTOSEL 5.15 12/17] drm/msm/dp: Clean up handling of DP AUX interrupts Sasha Levin
2023-05-01  3:04 ` [PATCH AUTOSEL 5.15 13/17] ACPICA: Avoid undefined behavior: applying zero offset to null pointer Sasha Levin
2023-05-01  3:04 ` [PATCH AUTOSEL 5.15 14/17] ACPICA: ACPICA: check null return of ACPI_ALLOCATE_ZEROED in acpi_db_display_objects Sasha Levin
2023-05-01  3:04 ` [PATCH AUTOSEL 5.15 15/17] media: cros-ec-cec: Don't exit early in .remove() callback Sasha Levin
2023-05-01  3:04 ` [PATCH AUTOSEL 5.15 16/17] drm/amd: Fix an out of bounds error in BIOS parser Sasha Levin
2023-05-01  3:04 ` [PATCH AUTOSEL 5.15 17/17] media: Prefer designated initializers over memset for subdev pad ops Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230501030435.3254695-7-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=maximlevitsky@gmail.com \
    --cc=oakad@yahoo.com \
    --cc=stable@vger.kernel.org \
    --cc=ulf.hansson@linaro.org \
    --cc=zyytlz.wz@163.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).