Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp838363ybt; Fri, 19 Jun 2020 15:21:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMnIKJRrKgiY4qRWy7DrA2YAp4dmPohPl6Xz4ZjCbc3E28Yo3YyY8U41v6O3FiHHAmCmxN X-Received: by 2002:a17:907:207b:: with SMTP id qp27mr6051812ejb.532.1592605308259; Fri, 19 Jun 2020 15:21:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592605308; cv=none; d=google.com; s=arc-20160816; b=ItDti3QY9NfuPvuzSIxleN1Cv7Kv5rKBNFvk9y7z/N33nN9ODK+wJzUaSa+chshppC iAh9dtnbTc49ozqXdknuYQJhIUFrwBXA5GYhr28zPWJr2Z1z5b+N1XHWhXNzE92xCjVE XYdrThcFgBKodfdJbBDwRejEVz3WniP1SJML7qescUzelzhez6DzPnTMgWwtEtSn9nCS VjxttrsmkeKw8eEnwBN1Z4kadabFx2aaLVz2Ws8EjdEHlToLBZ0geLTcw+CXCImaFEZ3 lRPsS4cgi6OsdkvqBLCB39AGJhkmNenRk9mtEyeboGjHdZo82Tt40dZhFvk8Z3ogLVcS PCJQ== 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=dAsBJ/xj9A4D5PZ4M77jUcEU2T/ff9IecRmwSMQHKWM=; b=hvayoIXSoy2CEY1cclbQR7g6aPLC338s16kgcA4z1NdVHxlIkQLO4zu8ykpRvdGKYa PofLVpN26f7627fim+V5lBu0H8Smq9Kvc3MfmRAPjVNMcWDqSWH7QIr/s9Nu/dGfg3D/ QPN9k5Dg72qJDKhvh/wyDVs1Jd7Q4xG5IZHDfJaJmEFscjXU3tFHzVcdUOezCVsJtjw/ vxnXT4ThYAipOg9gmxdSFiAoU8qX18t7a2JZPUEtUTLzF8ThPR5vQRGfEJwNqlZH+ChC 0t5/l786O6+fzXq6RDf+I3nvaG5/CMcasyK+mzs7e9kf74kFBa3i6eH00Z1OdCYUoCRg fppg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CjgE3+sc; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t22si4730856edt.28.2020.06.19.15.21.25; Fri, 19 Jun 2020 15:21:48 -0700 (PDT) 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=@kernel.org header.s=default header.b=CjgE3+sc; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404579AbgFSP23 (ORCPT + 99 others); Fri, 19 Jun 2020 11:28:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:59800 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404456AbgFSP17 (ORCPT ); Fri, 19 Jun 2020 11:27:59 -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 86D112186A; Fri, 19 Jun 2020 15:27:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592580479; bh=xeRy9E+bPKOBqWJn5njVkWn/IvLX5s54PB/5clmRkck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CjgE3+scnkKJRDM8AJmWgjzTJiJEVayCnQVGTBrot74+GvwxCufykZ9YRwkGV35Cc pdaYwzSIqGgDTXfWqfbW1OACVfHzffILo/1W4X+I7KKYwDo52yAKYpMEoQ9XZCNtWm e+2le8rz5zBLW6htXw0ZGbJkB7xvC7dt6hj7FBjU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Filipe Manana , David Sterba Subject: [PATCH 5.7 264/376] btrfs: fix wrong file range cleanup after an error filling dealloc range Date: Fri, 19 Jun 2020 16:33:02 +0200 Message-Id: <20200619141722.827995524@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141710.350494719@linuxfoundation.org> References: <20200619141710.350494719@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: Filipe Manana commit e2c8e92d1140754073ad3799eb6620c76bab2078 upstream. If an error happens while running dellaloc in COW mode for a range, we can end up calling extent_clear_unlock_delalloc() for a range that goes beyond our range's end offset by 1 byte, which affects 1 extra page. This results in clearing bits and doing page operations (such as a page unlock) outside our target range. Fix that by calling extent_clear_unlock_delalloc() with an inclusive end offset, instead of an exclusive end offset, at cow_file_range(). Fixes: a315e68f6e8b30 ("Btrfs: fix invalid attempt to free reserved space on failure to cow range") CC: stable@vger.kernel.org # 4.14+ Signed-off-by: Filipe Manana Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1142,7 +1142,7 @@ out_unlock: */ if (extent_reserved) { extent_clear_unlock_delalloc(inode, start, - start + cur_alloc_size, + start + cur_alloc_size - 1, locked_page, clear_bits, page_ops);