Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp575893pxb; Wed, 3 Mar 2021 09:53:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJyzbvURA2JaLD88O/AjNAADf2wgicE1dV2tNZ3SgUwDLvVI79MucyCc9LxvTZreNeefYsaL X-Received: by 2002:a17:907:75c2:: with SMTP id jl2mr12471ejc.334.1614794015220; Wed, 03 Mar 2021 09:53:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614794015; cv=none; d=google.com; s=arc-20160816; b=XFAXeMEvwvQFnLikmZIuGOqXi4kshQF7aisSL43/ay2zLHRi3m+C7f+vYfIr+Pytcw rM4UsGSRz9210QjueiD0JjMdjGC/6yuObdgWKaL/9PyOxKS4RKbpPcQNl2NOlh/TAcBg licl2kfVHx9UnPoXyifNHKgLt5gbptnDxyqBPInuBSZdJW91Fk9SX43CSTOmq6dW/nGZ YC3r0GsCZnCHgigjfgJbyMZ/em7q0K8IgP+r0skx44AYrdDxXt/jsWgz4OJMLAIRxcki 6nqmywZq2VFi/OuUG6/RJYwhJU+F7bSJug6WTUCiWAgQap3AeqdxNiiFBZNXxRzS+lSn ocYw== 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=sXa+pwzSlRxqUAAaKuBzbiOKj6wMGCLUEt0qR/MqeD0=; b=LcNkNplLaD4R8mYvSWaGxGZzUx5HKdavazym/b3/h3dS2CHIHDYajA9kxmTM+3rcpI B4PefprXFyP8BUGDmFuHNYe5Jg7pSDykbQkZzx+LRifgwSTH7qsWPXYZ7+bwLOS8okrq 6Y1Fb3VftmPgnS7x+n5Ip25HwF53Q2sBMdrMnXr4ElLG+7s3xIJpL0NAGndth/Czsxhh wGQsnhJw71YfPLPt3lwI0pAOQL0eBmEc8Ma30Sbg4fH3DCzltHkPYXxouIaXNPJnULqu b05ZNRF3IwDhWqIRCIY4CGtAr/8CWa/NiwG/qMrVZLqV36+c1f79o4cC+0eEplqtx71e Eedg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=o3h1eYhY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dj7si850616edb.378.2021.03.03.09.52.29; Wed, 03 Mar 2021 09:53:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=o3h1eYhY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1377560AbhCBArs (ORCPT + 99 others); Mon, 1 Mar 2021 19:47:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:54406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239699AbhCASoz (ORCPT ); Mon, 1 Mar 2021 13:44:55 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id EE44165245; Mon, 1 Mar 2021 17:27:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614619656; bh=7xUrZFdMAtN2wsS3VAoBK781D+1J90NzztFq0SFnIKY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o3h1eYhYmGTEMQc21THetr8vIqlUsU/X3smSOfNd8Yhsj/MiKTWw5bAJsZ6QoPggt ncRdXA495vs8H9PhHm0l5NDnANNGyB3UCkD0Xv6UIk6icaUw892IKUWodzQkTaQvNN BOdvNfO6j5DtXd0hj2cGPz0jP7qx4qEcX7ibvDj0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Josef Bacik , David Sterba Subject: [PATCH 5.10 534/663] btrfs: abort the transaction if we fail to inc ref in btrfs_copy_root Date: Mon, 1 Mar 2021 17:13:02 +0100 Message-Id: <20210301161208.272848308@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161141.760350206@linuxfoundation.org> References: <20210301161141.760350206@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Josef Bacik commit 867ed321f90d06aaba84e2c91de51cd3038825ef upstream. While testing my error handling patches, I added a error injection site at btrfs_inc_extent_ref, to validate the error handling I added was doing the correct thing. However I hit a pretty ugly corruption while doing this check, with the following error injection stack trace: btrfs_inc_extent_ref btrfs_copy_root create_reloc_root btrfs_init_reloc_root btrfs_record_root_in_trans btrfs_start_transaction btrfs_update_inode btrfs_update_time touch_atime file_accessed btrfs_file_mmap This is because we do not catch the error from btrfs_inc_extent_ref, which in practice would be ENOMEM, which means we lose the extent references for a root that has already been allocated and inserted, which is the problem. Fix this by aborting the transaction if we fail to do the reference modification. CC: stable@vger.kernel.org # 4.4+ Signed-off-by: Josef Bacik Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/ctree.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -221,9 +221,10 @@ int btrfs_copy_root(struct btrfs_trans_h ret = btrfs_inc_ref(trans, root, cow, 1); else ret = btrfs_inc_ref(trans, root, cow, 0); - - if (ret) + if (ret) { + btrfs_abort_transaction(trans, ret); return ret; + } btrfs_mark_buffer_dirty(cow); *cow_ret = cow;