Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp7351856rwi; Mon, 24 Oct 2022 13:24:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5sb+UnyCOpMPeKPfCAFVYZ2JY3nBGOPBQhfMh9RVTH5ueixQi1/fjPsW9wvi6DldcBmYxb X-Received: by 2002:a17:906:cc0f:b0:7a1:6786:f55 with SMTP id ml15-20020a170906cc0f00b007a167860f55mr11087971ejb.359.1666643046380; Mon, 24 Oct 2022 13:24:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666643046; cv=none; d=google.com; s=arc-20160816; b=PF7+0SO6RiWWbKv+p1oZp02p1IXOJQbWG2RN8kunNj+FWL9EWa8LBMYoRSjgnEBwV+ cca2h9mgP5MXJ1vobTGmHKkDgxktbofuw4qAr27IsIzTcL7jeGSwEf/FEuOXx8SlcYeV H/lQ10HbzigZdoilYDE2q4YDBsOUc1EAox4RHQeLM3Z9rxlexsnR4s39yFyJPus87Av0 9I2f2mz+3mOxEzZzLi+ddSdXB8sFEMyK6886cG2LrFiODRHvx9TES/0OPK85Vs3rIj1e RIiV8Yw2T6lpuAtC11/dw5t9+BY37Sq0qh/8SORoGmyttRPCxoFU94qRwxKzV43GcTH+ Y+vA== 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=rF6HSDI/14pORndBsKaorIz3AMJAed71ThD5Dprzig4=; b=lPMLLUMTULL2uyVz+Hwida4uSU+pRaxBQXKoE8nB/5glr5yi9NjyCe5ulkrtL8FE4s e8h5DBN8jlpx47YREvtJjVO9KX7Anpb42umqpVPGEVf6o9Zteiyea0TVMU679MsedJt+ 77tu79csh1lMl6rEhnGWybaY8HYol+BgyIUrAGBbXsgRQi/s379Qb9rO7icj6a++rFVE MRAJ+s6QACQrosk3Kc6/hfH3d9C9VlsaQFqm80JpL4yZZX9WceNMuFTLZF+287XXAvcQ DBSXtmLokE+HA1wkgKUc+zqNm9EfvwQHGWStpXKaKZYnO/RVuOC9vI+dFtp0LPoKAhFN ZbfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=mKFmumV4; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z16-20020a1709067e5000b0078bec673145si550440ejr.519.2022.10.24.13.23.41; Mon, 24 Oct 2022 13:24:06 -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=mKFmumV4; 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 S233864AbiJXTyF (ORCPT + 99 others); Mon, 24 Oct 2022 15:54:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233594AbiJXTwj (ORCPT ); Mon, 24 Oct 2022 15:52:39 -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 70DF173C35; Mon, 24 Oct 2022 11:17:24 -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 E169EB817C1; Mon, 24 Oct 2022 12:36:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F0B0C433D6; Mon, 24 Oct 2022 12:36:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614986; bh=Vos19/Db4czhMT1CsuPRfjC462d6PLCeRGLl/whOJxQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mKFmumV4r5ISFTK8Yd4MM0PQUuznghGYT3YJ4GkGuFIPJHYI26+nktKqHpkWj6o7o PPtnszxk4/rIVXkNQYfTGhYf3xcmQjflQOHjeyEQbnXK1zVumzCGmvPJ0m/RkuHp1x r3ovGSqf0gE/ui+dtUIIpsyS7kTrykjPquFy8cig= 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 5.15 079/530] btrfs: fix race between quota enable and quota rescan ioctl Date: Mon, 24 Oct 2022 13:27:03 +0200 Message-Id: <20221024113048.585821482@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 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 @@ -1157,6 +1157,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: