Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp25807ybp; Thu, 3 Oct 2019 09:40:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqx5uJzrkDVS1fPSbXddg2lBPK7vvyA4ga1rnaxG/myIaFsal/z/gfZdW4sCD0YF/fDNVmOY X-Received: by 2002:a05:6402:1ade:: with SMTP id ba30mr10720565edb.304.1570120856109; Thu, 03 Oct 2019 09:40:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570120856; cv=none; d=google.com; s=arc-20160816; b=YDjirlbILhzIMuc5KMccpH9NMVRX8JT4TpJbAC9rMTl+X/40C/qad6VZw+PYCQ9oGx dYoAcZhz/cuL4PzUfngwz73I1Uf76zP+S5KIOcuaguNmzZyC+pxNNzVt3SGT2+NzzU0f A0xiMdA5V4xexIRGnlueBm0QAxU5RL7orlZ+YsJfa4HPsQkPfhjQwo+xDPxIUngYEH+Y KEcF0KFXBzt2NUo/emBQBEs9BsJanSfwJFx5TBRfP7MwWyLSvrY81pYe/D8vp8rMw4oH gwfjkqkxB91bBO097myQZCsitpX2kVz/rm3dHd7wI6R/koxPveiVOz9bTHyLLDH+k0py UF9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WaxYbVOn891yd24D1bizsCnXIG7TgR2wf5RGyqco9fM=; b=lgo4udJAl3dc4ne1Q12vC/QISUvc50XlyoZkZeCBtVdeOvL2epXYaK+iERDbrsPYxS ReL4w77CN+dsxCy+F1ScYsxk+1U2sZWZos5KYUAgE0KRE33uPwIEcHeJW/nALJX3EHv2 ISsMo6pQtsN9VQMoTrhH+24SRErYA/XAXo8+NGd52iGBc9KLHAsFGYRRFLByF6jdJGzt LyVsM64SeMsSmpj17WyUWuPnQUoZ1SN2mAf/uO1+830ywjsFiwGYNsCEOlF72Phm4UpQ YFJN49AQlmwSqualVA77bMZyuC9fVcacnEmN87jtNtfkG9nx/6x18HFlqxZxKAjM0nn+ cqsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=u8APLonG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k24si1459610ejz.284.2019.10.03.09.40.31; Thu, 03 Oct 2019 09:40:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=u8APLonG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404681AbfJCQiF (ORCPT + 99 others); Thu, 3 Oct 2019 12:38:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:47664 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391875AbfJCQiE (ORCPT ); Thu, 3 Oct 2019 12:38:04 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0812C2133F; Thu, 3 Oct 2019 16:38:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120683; bh=mdL0Q4Tu0YQ0/7eHxAxBpSVNI6snCFhuwkmBw7iEIB0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u8APLonGcBK6V9t8xKAzf2b1s1zcWwudCFlCbS2aag2UiF1SRiegf2OQoRSWm0jvY 1a4V7LjVXsT/OYMcImiUmnDl/XqllBynl3HEgTnK4vGktSf1YFBWu9fEufEzMFRiBs dZj7cqoiP/xgxk/B82bF/Ap2SPFSMFiaw8PVUfM0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Josef Bacik , Nikolay Borisov , Qu Wenruo , David Sterba Subject: [PATCH 5.2 286/313] btrfs: qgroup: Fix the wrong target io_tree when freeing reserved data space Date: Thu, 3 Oct 2019 17:54:24 +0200 Message-Id: <20191003154601.251693714@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154533.590915454@linuxfoundation.org> References: <20191003154533.590915454@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qu Wenruo commit bab32fc069ce8829c416e8737c119f62a57970f9 upstream. [BUG] Under the following case with qgroup enabled, if some error happened after we have reserved delalloc space, then in error handling path, we could cause qgroup data space leakage: >From btrfs_truncate_block() in inode.c: ret = btrfs_delalloc_reserve_space(inode, &data_reserved, block_start, blocksize); if (ret) goto out; again: page = find_or_create_page(mapping, index, mask); if (!page) { btrfs_delalloc_release_space(inode, data_reserved, block_start, blocksize, true); btrfs_delalloc_release_extents(BTRFS_I(inode), blocksize, true); ret = -ENOMEM; goto out; } [CAUSE] In the above case, btrfs_delalloc_reserve_space() will call btrfs_qgroup_reserve_data() and mark the io_tree range with EXTENT_QGROUP_RESERVED flag. In the error handling path, we have the following call stack: btrfs_delalloc_release_space() |- btrfs_free_reserved_data_space() |- btrsf_qgroup_free_data() |- __btrfs_qgroup_release_data(reserved=@reserved, free=1) |- qgroup_free_reserved_data(reserved=@reserved) |- clear_record_extent_bits(); |- freed += changeset.bytes_changed; However due to a completion bug, qgroup_free_reserved_data() will clear EXTENT_QGROUP_RESERVED flag in BTRFS_I(inode)->io_failure_tree, other than the correct BTRFS_I(inode)->io_tree. Since io_failure_tree is never marked with that flag, btrfs_qgroup_free_data() will not free any data reserved space at all, causing a leakage. This type of error handling can only be triggered by errors outside of qgroup code. So EDQUOT error from qgroup can't trigger it. [FIX] Fix the wrong target io_tree. Reported-by: Josef Bacik Fixes: bc42bda22345 ("btrfs: qgroup: Fix qgroup reserved space underflow by only freeing reserved ranges") CC: stable@vger.kernel.org # 4.14+ Reviewed-by: Nikolay Borisov Signed-off-by: Qu Wenruo Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/qgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -3469,7 +3469,7 @@ static int qgroup_free_reserved_data(str * EXTENT_QGROUP_RESERVED, we won't double free. * So not need to rush. */ - ret = clear_record_extent_bits(&BTRFS_I(inode)->io_failure_tree, + ret = clear_record_extent_bits(&BTRFS_I(inode)->io_tree, free_start, free_start + free_len - 1, EXTENT_QGROUP_RESERVED, &changeset); if (ret < 0)