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 7C35CC77B61 for ; Mon, 1 May 2023 03:17:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233206AbjEADRL (ORCPT ); Sun, 30 Apr 2023 23:17:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233816AbjEADQS (ORCPT ); Sun, 30 Apr 2023 23:16:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0937061B1; Sun, 30 Apr 2023 20:06:58 -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 D29B9617C0; Mon, 1 May 2023 03:06:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DFE5C4339B; Mon, 1 May 2023 03:06:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682910377; bh=OtBYrX14mxTpbm1B0QpoHXJUjd80vi3tq+CGMksfjIo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uirppBh9VPq+Y3L3AOGwCB6d9lOemdbmDhxRrm21zAqCds/Uy4O3xcgeCkVnVFoQ2 C/odYoWgKze0Fs6zMdIcfhQ6gSY6FhN2lnM/kVD6Po/sDbwNc4YTvv7qYRrL39Ov3+ BSeWmgNgF+i4/JdxBxbGDpuyRBb4/3KQeVqlOfMan6QMpusPrDXDr94mjD+u9IG1TJ Hl38IZS3Qrc8+PuHy6PQY+msuVvbCuZHADqe2zzpX/dJrwRzTIjzYhTv8IENxRQtOR 5S8vfbsQ+j7jkK5HdvUDlbiXoSm4o9rK3krA8ml7nsAxk+WzYrx//CSOezT5WNnwib 5R7lbPLYB1tdw== 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 5.4 3/9] memstick: r592: Fix UAF bug in r592_remove due to race condition Date: Sun, 30 Apr 2023 23:06:03 -0400 Message-Id: <20230501030611.3255082-3-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230501030611.3255082-1-sashal@kernel.org> References: <20230501030611.3255082-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 eaa2a94d18be4..dd06c18495eb6 100644 --- a/drivers/memstick/host/r592.c +++ b/drivers/memstick/host/r592.c @@ -828,7 +828,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