From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD545C7EE23 for ; Mon, 1 May 2023 03:11:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232804AbjEADLc (ORCPT ); Sun, 30 Apr 2023 23:11:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232985AbjEADKH (ORCPT ); Sun, 30 Apr 2023 23:10:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5E492117; Sun, 30 Apr 2023 20:04:09 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 37FB66179B; Mon, 1 May 2023 03:03:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3833C4339B; Mon, 1 May 2023 03:03:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682910196; bh=DWstlYSb6HQkL3J/mt/Oo2KXh8UsNNnwfW+H9bnZiTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HzXgwG/EU4fUOTakgrmGGLnknDc7aOrOT5WanJCHYmuvvC/rMdqqyDhVxrrD1AL7J MmGL5k4yC+T+9f2BtzUUsS0KQDXugYh8IV1t5jjX/oAyHPaz6z4bc0mmfyR/k6Myev GEJ8XownshaJHyCNxkJ1qF4xp5QyxATryejJpEVx+8S6lT1ijQvu+fj8ro2fbegh8n zNyV+N/RwAblLqvNP6vZojzC188c8XlK8OJsYwyTjVbCdU1/hPEWaRECqbr1aY56Bn FUKJBeIZpMQzYVGf9fIZNiKScCqyT0B9tW6cadh72PQbejTwG88jfmazuvraI7ZVMI jKiGALvjGPPnQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zheng Wang , Ulf Hansson , Sasha Levin , maximlevitsky@gmail.com, oakad@yahoo.com, linux-mmc@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 15/33] memstick: r592: Fix UAF bug in r592_remove due to race condition Date: Sun, 30 Apr 2023 23:02:09 -0400 Message-Id: <20230501030227.3254266-15-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230501030227.3254266-1-sashal@kernel.org> References: <20230501030227.3254266-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zheng Wang [ 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 Link: https://lore.kernel.org/r/20230307164338.1246287-1-zyytlz.wz@163.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- 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