From patchwork Mon Dec 26 03:06:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 36522 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp720969wrt; Sun, 25 Dec 2022 18:47:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXt6GkosIr5LM2DLbfOtT2xvrE6qAmPi7jyn/ZNTExroLtrsQFsfkfSUjMZZnII2l5m+f/e+ X-Received: by 2002:a17:906:a0cf:b0:7c1:4d21:abb7 with SMTP id bh15-20020a170906a0cf00b007c14d21abb7mr13738528ejb.54.1672022875815; Sun, 25 Dec 2022 18:47:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672022875; cv=none; d=google.com; s=arc-20160816; b=p70aUZw5NHTcl4ikBvvYOMBMBD8vu8G2BM2BOo3lOjor7+Z3YLXJd+aeqcikBc9bMl itdpQigRys3quq6sG0ESYSxcG6u+tgnzLpp1vbsp22bUFAXhwI5kRzn6XsrzqwPzI83C P1xuCM6wpWIwfRol5zy/ff9PyTqN7I8pQmd3xsj5+f2BAvWvoFHSomRBa6h74uc+NvoP wcPXQvO+WanCIsQeOdKwHxi4IbfqI9YORr3/4rKFZ+TrpUIeA3i7UBPTkIzLrkXJVnB3 F3bTLOywEuHmkJirbaiTK1iP0xC/LCADJkJvPEnd4fIaPsyEjL3kaqjrmncbriKcgs/M BTCw== 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; bh=vX+w7h6L2TZ+ATV2Jre6QxI2VXd7q912ybqbaB3K1w8=; b=Txv8l1khF56FYy4NSgmWLKRdW3l1RTgiAm8CNIX2dLCFBsB3WmH7XVmo2aCmZfHjAh v4x5O3M1T8F09HNKCl8k/VG4MvJStYRIOVjHM+NYraLIEyvKQLEXwTpewpZBi3vJkiE8 DpZCqGlV+R/9fKQ03KejsnKCQAOJ3RFlykjymEgDkVpBYvYSSYiVzLtFp/iXMsM3hwHt TVCxs32IvXHeEoIeA5KT3Tnsodu0v5B8E5qA/JMoZfxDG6uKXcaQu2iWGNaVFu5wvRMr vH+IHwWwxMvISoh2fbfliPWP+X2/SD8G+yNii6SwBVQImloEZiZ5jQgnZdtDUWVEfuXK RLCg== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ne9-20020a1709077b8900b0078e27f2ef52si7584132ejc.603.2022.12.25.18.47.18; Sun, 25 Dec 2022 18:47:55 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231438AbiLZCpp (ORCPT + 99 others); Sun, 25 Dec 2022 21:45:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229619AbiLZCpn (ORCPT ); Sun, 25 Dec 2022 21:45:43 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FBB726CD; Sun, 25 Dec 2022 18:45:39 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NgMbL0f2tz4f3p0l; Mon, 26 Dec 2022 10:45:34 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgD3X7POCqlj9sodAg--.46702S4; Mon, 26 Dec 2022 10:45:36 +0800 (CST) From: Yu Kuai To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com Subject: [PATCH] block, bfq: fix uaf for bfqq in bfq_exit_icq_bfqq Date: Mon, 26 Dec 2022 11:06:05 +0800 Message-Id: <20221226030605.1437081-1-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CM-TRANSID: gCh0CgD3X7POCqlj9sodAg--.46702S4 X-Coremail-Antispam: 1UD129KBjvdXoW7Xr13tr15KF1rJFykuF4fAFb_yoWDtrX_Ww 1xC3sa9F18Xry5Gr4Yy3y5Ar18u3y5Xr1kKF95KrnrXFy5JF1ay397KFWfZan8WFZxWayf tr4vgwsrJw10vjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbzxFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8w A2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j 6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oV Cq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0 I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r 4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCF04k20xvY0x0EwIxG rwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4 vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IY x2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26c xKx2IYs7xG6rW3Jr0E3s1lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x02 67AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbXdbUUUUUU== X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham 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?1753243058997353745?= X-GMAIL-MSGID: =?utf-8?q?1753243058997353745?= From: Yu Kuai Commit 64dc8c732f5c ("block, bfq: fix possible uaf for 'bfqq->bic'") will access 'bic->bfqq' in bic_set_bfqq(), however, bfq_exit_icq_bfqq() can free bfqq first, and then call bic_set_bfqq(), which will cause uaf. Fix the problem by moving bfq_exit_bfqq() behind bic_set_bfqq(). Fixes: 64dc8c732f5c ("block, bfq: fix possible uaf for 'bfqq->bic'") Reported-by: Yi Zhang Signed-off-by: Yu Kuai Reviewed-by: Jan Kara --- block/bfq-iosched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 16f43bbc575a..ccf2204477a5 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5317,8 +5317,8 @@ static void bfq_exit_icq_bfqq(struct bfq_io_cq *bic, bool is_sync) unsigned long flags; spin_lock_irqsave(&bfqd->lock, flags); - bfq_exit_bfqq(bfqd, bfqq); bic_set_bfqq(bic, NULL, is_sync); + bfq_exit_bfqq(bfqd, bfqq); spin_unlock_irqrestore(&bfqd->lock, flags); } }