Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp6016870ybc; Wed, 27 Nov 2019 13:28:13 -0800 (PST) X-Google-Smtp-Source: APXvYqyul+TD6soOthWxU6GRV1OL5jnMr3XbNImQloWsd6RgoHFKvWZAVHZUsjDbWJjlYx/GBGbk X-Received: by 2002:a17:906:1f12:: with SMTP id w18mr4463432ejj.63.1574890093032; Wed, 27 Nov 2019 13:28:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574890093; cv=none; d=google.com; s=arc-20160816; b=HR89BhkA8LFK5fMGFVD8Pai35a6nOJAQa03bnXHGpuD5dESqoPAyPCOyVSgQC/DplX xQNXbwgpEDe+DVfOAeqHFlKLWXLl4skTXP7I+hKCAEYS5ytkeNOJc+1DsGwQaHJVVbmO G8MwQqdmlFjTdbpVCuWivdBjBDM1cASBRpqMr836QpxduyKCGggOiDJLAlC8fiRIEyRG lukxJzb0o1SHYDX30b3Sp+deFTq7rgH1NpTjiqZWZPnHzufV4xvKclOyAqEI4Fyb06Nw W9c9K9OltxI5M7ACKUjjhGEF3EAAfTBi98B/K5unx56Orid+b+sv2MuuQ59qlJEWAtKl yCrw== 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=qukEXKbrTpsXi1Ex4KUZmBd7JoYN8j509gRwGIaYiOA=; b=TvPBQ1n4x78EXL6551eCEI2WRl2rWp2HqR3yqlfLjqNdYkwLHWnyI7cd+UpsPysleY xLsAiwYy3HdsBtEYqmPeBIU66kwcOaXWjjHxNy+8pezy/Grlq3yMeaf3tohAMYGpB1sJ zVpCFA7GfrfsyjmuDHWamPMD8scGOOCyWTjzhKSSgHcFIiSLKcavMz2k76xWcCRkfnyI D6JObw5z01IiuPF6uGG+ladkmfBbdMGbj0EcwbLfZl9OwmaaGUBdmmBdWewleyif3eLJ E4VlK/ZHtDa5Dw5HbuOr9kZftp7zDE1kT29I367uqneYz6mh6jeSIuzl2/HaRZ+MXsp/ yKgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UmUelrDq; 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 g21si207829ejr.195.2019.11.27.13.27.49; Wed, 27 Nov 2019 13:28:13 -0800 (PST) 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=UmUelrDq; 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 S1731426AbfK0VBm (ORCPT + 99 others); Wed, 27 Nov 2019 16:01:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:53988 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731741AbfK0VBh (ORCPT ); Wed, 27 Nov 2019 16:01:37 -0500 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 A26592086A; Wed, 27 Nov 2019 21:01:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888497; bh=qt+8C+wStI+Ia8A369Sl1rBnYmbCBlYZqnKS7bIgTbg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UmUelrDqBi4wwFtZ8qO4+84PM0C+C9GP7TeRcenlDchzuKwQZ6CuX4SLr5cHEDnMW BANDLT4pUljc3a8XyfPZ91kXINZOldsMSSE5Z3CDX0rp/ycfWd15UE6CKzio4HrPTY CmT28nV1gH97tqxLjfRmaztIoCAR6Cj3ldUTgCrg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Darrick J. Wong" , Christoph Hellwig , Dave Chinner , Sasha Levin Subject: [PATCH 4.19 158/306] vfs: avoid problematic remapping requests into partial EOF block Date: Wed, 27 Nov 2019 21:30:08 +0100 Message-Id: <20191127203127.101821881@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203114.766709977@linuxfoundation.org> References: <20191127203114.766709977@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: Darrick J. Wong [ Upstream commit 07d19dc9fbe9128378b9e226abe886fd8fd473df ] A deduplication data corruption is exposed in XFS and btrfs. It is caused by extending the block match range to include the partial EOF block, but then allowing unknown data beyond EOF to be considered a "match" to data in the destination file because the comparison is only made to the end of the source file. This corrupts the destination file when the source extent is shared with it. The VFS remapping prep functions only support whole block dedupe, but we still need to appear to support whole file dedupe correctly. Hence if the dedupe request includes the last block of the souce file, don't include it in the actual dedupe operation. If the rest of the range dedupes successfully, then reject the entire request. A subsequent patch will enable us to shorten dedupe requests correctly. When reflinking sub-file ranges, a data corruption can occur when the source file range includes a partial EOF block. This shares the unknown data beyond EOF into the second file at a position inside EOF, exposing stale data in the second file. If the reflink request includes the last block of the souce file, only proceed with the reflink operation if it lands at or past the destination file's current EOF. If it lands within the destination file EOF, reject the entire request with -EINVAL and make the caller go the hard way. A subsequent patch will enable us to shorten reflink requests correctly. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Dave Chinner Signed-off-by: Sasha Levin --- fs/read_write.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/fs/read_write.c b/fs/read_write.c index 5fb5ee5b8cd70..2195380620d02 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1715,6 +1715,34 @@ static int clone_verify_area(struct file *file, loff_t pos, u64 len, bool write) return security_file_permission(file, write ? MAY_WRITE : MAY_READ); } +/* + * Ensure that we don't remap a partial EOF block in the middle of something + * else. Assume that the offsets have already been checked for block + * alignment. + * + * For deduplication we always scale down to the previous block because we + * can't meaningfully compare post-EOF contents. + * + * For clone we only link a partial EOF block above the destination file's EOF. + */ +static int generic_remap_check_len(struct inode *inode_in, + struct inode *inode_out, + loff_t pos_out, + u64 *len, + bool is_dedupe) +{ + u64 blkmask = i_blocksize(inode_in) - 1; + + if ((*len & blkmask) == 0) + return 0; + + if (is_dedupe) + *len &= ~blkmask; + else if (pos_out + *len < i_size_read(inode_out)) + return -EINVAL; + + return 0; +} /* * Check that the two inodes are eligible for cloning, the ranges make @@ -1821,6 +1849,11 @@ int vfs_clone_file_prep_inodes(struct inode *inode_in, loff_t pos_in, return -EBADE; } + ret = generic_remap_check_len(inode_in, inode_out, pos_out, len, + is_dedupe); + if (ret) + return ret; + return 1; } EXPORT_SYMBOL(vfs_clone_file_prep_inodes); -- 2.20.1