From patchwork Mon Oct 24 11:29:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8767 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp430426wru; Mon, 24 Oct 2022 05:41:31 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5dSiGaSJLGP7rapQzGaciU6pz2Iy0k2/J4QXWIsQB61m7aGHqZzhE9aWBJrYty4pe6jzs8 X-Received: by 2002:a05:6a00:a04:b0:534:d8a6:40ce with SMTP id p4-20020a056a000a0400b00534d8a640cemr34070671pfh.15.1666615291068; Mon, 24 Oct 2022 05:41:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615291; cv=none; d=google.com; s=arc-20160816; b=Rae2Hs4t1j6/xjEnJ7hX9zX/Pl5vpc8nMG4p6euuNxTu/rQIA0tKeB0aonqrVdIghC c3eYJBzhRYRvXmEwZkvurg+tfOOpypNiUVZu3/VnKVb04rzw0lCySdK8j+5IxCrJmlog Mf99QYd/4sstEPi/uAIvYTHgeEktmyzN25HgFkhXOUxvdTyJwzAXwvGSyic40vtUMKDe viHVO4AxkrqyVzq9Wvb5bSYcohTiMS/u5mVdNfpNsMm64378BmTzRIqocDGSIWfKCdmD tj8oHHUy3HpjkAwSsBr43ZNKFPRmF/F0IxkCJQ0NtJ3jIpztOAPn8H1vstj1nRfgWSDy DUzA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dg3OVFmefhE2BQKGAvYjIK8In1f5D+1pCIM+9/3lUMU=; b=vs0VoKNN4TG4g9e4D8JdTbObr4uKAE5yBx+1m98FkziCa/HsBdliyv2Ulw6Ir90b5J jeAkcerx07Qns36kJPnaLexiobXmrM08OFm30pfcgeDl/TKJ0jnE6GDd6o2qmJhPIWXu B8Ua0psL+XY9zF+pdxgIsprswIchfWNw7FBN+5Dly1pZaGtvtfa5vQO4ggqkSCzN2TG7 qD9GXXDurbEUr388ghVqdzZLLFwjZjUew8u7Ta7eJdl86ZmiB/WOWJzjGn0n6ll52UOA Molt56HhbTtRsARPY0Rh7EKGQ7aYWBErGUezVaa7u59Gn0JMnnrUVQV6jR53xcStpnYT kesw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ENtezN+k; 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=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r9-20020a1709028bc900b001768a29b9dfsi8885929plo.68.2022.10.24.05.41.16; Mon, 24 Oct 2022 05:41:31 -0700 (PDT) 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=@linuxfoundation.org header.s=korg header.b=ENtezN+k; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233846AbiJXMa4 (ORCPT + 99 others); Mon, 24 Oct 2022 08:30:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233874AbiJXM2c (ORCPT ); Mon, 24 Oct 2022 08:28:32 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9626486892; Mon, 24 Oct 2022 05:02:13 -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 ams.source.kernel.org (Postfix) with ESMTPS id 19677B811BB; Mon, 24 Oct 2022 11:58:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73049C433D6; Mon, 24 Oct 2022 11:58:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612695; bh=MJMYAYbebJ4eMXZJ9gKN+EzXQUKtgGBJb83mkrtYU5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ENtezN+kAmXuXxsoEKVxxjuIQrRoYkc4RjEtzaiCGMjMxF3shcErEnTGJeWdSVms1 AHcrtdaTR44T7LShFWqVfDkhGTVafJ2lcFQ+98wer3fU7bxZliuRfNXax7eQfgX/2t bONtFofeybvypByUOz+hWrtTaT7GQoR6wGRwq3n0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ye Bin , Qu Wenruo , Filipe Manana , David Sterba Subject: [PATCH 4.19 055/229] btrfs: fix race between quota enable and quota rescan ioctl Date: Mon, 24 Oct 2022 13:29:34 +0200 Message-Id: <20221024113000.860747439@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1747572795587552684?= X-GMAIL-MSGID: =?utf-8?q?1747572795587552684?= From: Filipe Manana commit 331cd9461412e103d07595a10289de90004ac890 upstream. When enabling quotas, at btrfs_quota_enable(), after committing the transaction, we change fs_info->quota_root to point to the quota root we created and set BTRFS_FS_QUOTA_ENABLED at fs_info->flags. Then we try to start the qgroup rescan worker, first by initializing it with a call to qgroup_rescan_init() - however if that fails we end up freeing the quota root but we leave fs_info->quota_root still pointing to it, this can later result in a use-after-free somewhere else. We have previously set the flags BTRFS_FS_QUOTA_ENABLED and BTRFS_QGROUP_STATUS_FLAG_ON, so we can only fail with -EINPROGRESS at btrfs_quota_enable(), which is possible if someone already called the quota rescan ioctl, and therefore started the rescan worker. So fix this by ignoring an -EINPROGRESS and asserting we can't get any other error. Reported-by: Ye Bin Link: https://lore.kernel.org/linux-btrfs/20220823015931.421355-1-yebin10@huawei.com/ CC: stable@vger.kernel.org # 4.19+ Reviewed-by: Qu Wenruo Signed-off-by: Filipe Manana Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/qgroup.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1035,6 +1035,21 @@ out_add_root: fs_info->qgroup_rescan_running = true; btrfs_queue_work(fs_info->qgroup_rescan_workers, &fs_info->qgroup_rescan_work); + } else { + /* + * We have set both BTRFS_FS_QUOTA_ENABLED and + * BTRFS_QGROUP_STATUS_FLAG_ON, so we can only fail with + * -EINPROGRESS. That can happen because someone started the + * rescan worker by calling quota rescan ioctl before we + * attempted to initialize the rescan worker. Failure due to + * quotas disabled in the meanwhile is not possible, because + * we are holding a write lock on fs_info->subvol_sem, which + * is also acquired when disabling quotas. + * Ignore such error, and any other error would need to undo + * everything we did in the transaction we just committed. + */ + ASSERT(ret == -EINPROGRESS); + ret = 0; } out_free_path: