From patchwork Tue Mar 7 16:42:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Wang X-Patchwork-Id: 65703 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2538091wrd; Tue, 7 Mar 2023 08:53:29 -0800 (PST) X-Google-Smtp-Source: AK7set8Bx+WBkrEoztpSLBNx56hgZZFf9+JL1Rqagmh0xW5vxgv3kt+qW9O8Sjej05csc0ev723X X-Received: by 2002:a17:906:1983:b0:8f7:51e5:9994 with SMTP id g3-20020a170906198300b008f751e59994mr13549887ejd.27.1678208009501; Tue, 07 Mar 2023 08:53:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678208009; cv=none; d=google.com; s=arc-20160816; b=hLIb0dCLIi9NLrYwLO+G7qYNilJHMUFCN9IQK4Z7fhlp2h2BoqFFy+bwQgv227iZ5P IQmJ1Z/TLSGYDVOb5peU79rHvWTrBssig1uOdcBrYzXJZy0xhzJcr0zwBvdBlpurwU/3 1bwqpT6BIE2akNxLvzK/4HxORqXsdFbRJloC6v+6HQbf8+06Iq5fCl4Bi08YezYKewO4 wCx5AZ5/zmJDgKH1kwXo+vzf6+OhCPg6YZhm7p17XJ5Bo7tfk8HR+6doAEpEsIUv0J8n pCmngwBpPpy7QXllAhzCWvRXjSqrftegevo+QaRUHHFBkdwSLDHj5w4/cRhefc3n/+QN +Xcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ZvgJq6YQjqwerye4CIoGP8CONxW/nYcnI2f8hDW3NOY=; b=OhwJfzpbG8BvQgh50ihws03u52iMBOfUfUqf9fviJytKUANF+9OeIs/Rav71CMdGWm 4AA5jvsX4lJq1ln4W2Fk0q6Wv1A66e76wp+7dqMo2c4pXH8wv57JY5JZ2V3ziZpcijWv 7KO7XPebB+xwgrdwefRDn16y/QAxsIqEox17zcgAVqtAfClXI89H+ORBD7nHBrngaB26 rZceqb82eszll90v/oQ1FlwGNSGPV/n5Nwj/kwVTX3OfKYrBvHX4r50d4rPn+qxg6aHK tBgfdBH+JaOM8jFyMIW8vsGirkQznKbTH+YM5c26pKowQA94+Kvm5h7llYrfBZowJ4qZ oZgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=eCxvF9le; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hs17-20020a1709073e9100b008b2c034ca3dsi1040814ejc.744.2023.03.07.08.53.05; Tue, 07 Mar 2023 08:53:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=eCxvF9le; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230109AbjCGQqu (ORCPT + 99 others); Tue, 7 Mar 2023 11:46:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229687AbjCGQqb (ORCPT ); Tue, 7 Mar 2023 11:46:31 -0500 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.196]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DE3AD59C5; Tue, 7 Mar 2023 08:43:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=ZvgJq 6YQjqwerye4CIoGP8CONxW/nYcnI2f8hDW3NOY=; b=eCxvF9lelgvUf1BW4fTWU 3/qR3RaQjjJsIkdrGJ4A2xerExV7DE9Y8u0dyiGlEVFxwCugEImCwBTqxRpY54z0 yZWmDDyIKS8GkOJOtKxaVovt3+HrONz2E+BxmboUgVlVRY4Za3C2HuM1XFckVdaH +TlYktQr7cJcHRHCwv+I/8= Received: from leanderwang-LC2.localdomain (unknown [111.206.145.21]) by zwqz-smtp-mta-g4-4 (Coremail) with SMTP id _____wAnL_eIaQdk3p3pCQ--.58784S2; Wed, 08 Mar 2023 00:42:48 +0800 (CST) From: Zheng Wang To: maximlevitsky@gmail.com Cc: oakad@yahoo.com, ulf.hansson@linaro.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, hackerzheng666@gmail.com, 1395428693sheep@gmail.com, alex000young@gmail.com, Zheng Wang Subject: [PATCH] memstick: r592: Fix UAF bug in r592_remove due to race condition Date: Wed, 8 Mar 2023 00:42:47 +0800 Message-Id: <20230307164247.1245293-1-zyytlz.wz@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: _____wAnL_eIaQdk3p3pCQ--.58784S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7Jr1rJryfAr4rKrWxGFyUWrg_yoWkuwb_uF yrZFySgr48Grn5Ww1UCFy3ur4Uuw1qgFZ7Za18Kry3JayUGF1UXr1kZr9ava1xu3y29Fy3 CrWUJ3WIgw15ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRKBMNUUUUUU== X-Originating-IP: [111.206.145.21] X-CM-SenderInfo: h2113zf2oz6qqrwthudrp/1tbiXAorU1Xl52YmvgAAsH X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_RPBL,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759728641750077645?= X-GMAIL-MSGID: =?utf-8?q?1759728641750077645?= 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 --- 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 1d35d147552d..2bfa7eaae80a 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) {