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 X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB534C433F5 for ; Fri, 17 Sep 2021 02:34:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A30FA61108 for ; Fri, 17 Sep 2021 02:34:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243061AbhIQCgM (ORCPT ); Thu, 16 Sep 2021 22:36:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:33176 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242847AbhIQCfs (ORCPT ); Thu, 16 Sep 2021 22:35:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9391061164; Fri, 17 Sep 2021 02:34:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631846067; bh=JV/I3sWrutKzK7p8ZnrvUoZG5aJchWwcew+bD5prKA4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RDb9xTRrg/Q1DGAxBRl0sksCDCp1oj3adqSU0yKU0ntxtE+ybbflfNxIPuqi7sbDZ ZG2kQA1F8jA8wX4YjRm8OZkyBrWSjRORtD1PDdBoDKViDE5uV738+RIx6P9QxYgBH8 UbfGwHxnvN0l3NPrOOSgnKJshGK2B1ty0LTUrcENmWyWhZrBFzskMlsLWrxS0VuJaI im73rNs87TcgPuXkvT19xVkCsoGbIrMld/BiVNh1GQ3kfvvAzDxT/Amy7FL4af4gC/ 2D76JXi/DRjmJva7Db7UDvntNyWGYxV8fmguUFiTcIyuUEg6JwhHlFrpPJ/bKhot2z 72Go+B/LqJvPQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Li Jinlin , Jens Axboe , Sasha Levin , tj@kernel.org Subject: [PATCH AUTOSEL 5.14 16/21] blk-throttle: fix UAF by deleteing timer in blk_throtl_exit() Date: Thu, 16 Sep 2021 22:33:10 -0400 Message-Id: <20210917023315.816225-16-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210917023315.816225-1-sashal@kernel.org> References: <20210917023315.816225-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: linux-kernel@vger.kernel.org From: Li Jinlin [ Upstream commit 884f0e84f1e3195b801319c8ec3d5774e9bf2710 ] The pending timer has been set up in blk_throtl_init(). However, the timer is not deleted in blk_throtl_exit(). This means that the timer handler may still be running after freeing the timer, which would result in a use-after-free. Fix by calling del_timer_sync() to delete the timer in blk_throtl_exit(). Signed-off-by: Li Jinlin Link: https://lore.kernel.org/r/20210907121242.2885564-1-lijinlin3@huawei.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/blk-throttle.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index b1b22d863bdf..d0cc77c7b8bd 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -2426,6 +2426,7 @@ int blk_throtl_init(struct request_queue *q) void blk_throtl_exit(struct request_queue *q) { BUG_ON(!q->td); + del_timer_sync(&q->td->service_queue.pending_timer); throtl_shutdown_wq(q); blkcg_deactivate_policy(q, &blkcg_policy_throtl); free_percpu(q->td->latency_buckets[READ]); -- 2.30.2