Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4743099pxj; Wed, 9 Jun 2021 00:18:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwV5EVkRXuyWZjDM9RVTuDUR+fz87yohscfOlrKs7VmuFUzfUTLy5gOYqpt03D6aL8LK51Q X-Received: by 2002:a17:906:3c56:: with SMTP id i22mr27863854ejg.369.1623223137916; Wed, 09 Jun 2021 00:18:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623223137; cv=none; d=google.com; s=arc-20160816; b=pUfNdaNcTe7BOMKt3WJQ40ZU8SAmoh8HFPESrfo/2TKKlvp+ZnTgcqa1gEBVJWZxIk Y1XiykfwiiE0vpycntcYwydeZQKG0KtE4qfe1DH7ZYJ8FxHD4SrGA0t+EIw9nUFN5lKn wxO51mqWm1HWMQywn4BaJ/KxDN84leESIJEKgoMPNzovmlJDc6+f9/PW5RL90PL5wnsG XZJzmw+zefwtoJlrGd/DqLSIkPXzavV3WV4GZndmjT7TY991MPbNcOxbJUuv9FARsb1R 2rS5h5yWNk0lPzjss1XwRk0agxN6EA2lMGLRYBcmVazqXbR9xDYdzy+dMPyBarixImZb mNLg== 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=Nbi2rEEvc8/F/0XUmrhzewixAt+yK17PrVgJJZUObzc=; b=LybZDsb8Se9SJ+h/+IrfLJNVKP1zo9T9OyS2jJwy8GuzPxS5uRm3AaulIQ/iwm3U1h zYkIxDAw34p57ybLfJl/dWa+HKxP+7oEFgMAQ52yx0mGR/NxictlLWv/HOL+A14F7vYT vYMlgqHJJsAqh8z6jDmOXkkgf0jxDtvLti4amDts5sJlgdsJNmuxJtE49IxRAt69uBlO CIUKUCbaSnzlaObcC/kNgF7kc1fbGxc5B7b02f+3hV7Lks5BlRz6bfHRxm9y2KaGq3NS 3c9zhpho4Gedwx206kFbXLg46GvljmzznSccsG2MV95IrbHVVNuSS9cv9BFg+a0y1xtI QvUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rsRf+ehF; 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 cr15si2126131ejc.258.2021.06.09.00.18.34; Wed, 09 Jun 2021 00:18:57 -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=@linuxfoundation.org header.s=korg header.b=rsRf+ehF; 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 S235419AbhFHSvY (ORCPT + 99 others); Tue, 8 Jun 2021 14:51:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:45272 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235550AbhFHSqP (ORCPT ); Tue, 8 Jun 2021 14:46:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 811F5613D0; Tue, 8 Jun 2021 18:37:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623177445; bh=xpoj0fyd6Ba+qXhkJrd3w89Pb8mWMc8DqB5qmlawlM8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rsRf+ehFBMoIdp1xg4GbMilT8aelMk9G2GeW3zikbtSSTS1bPK5JRFAUBdVWKfGZw ervnpXj5481brEwQsqruZAKWHeUkmKTtIC0K211aCrlUXjxDlLWBK8EXao7VMqLrvu sthCtroPMWNbNmKUz248+YCTPAohizNC+Ae5XjKE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Junxiao Bi , Joseph Qi , Jan Kara , Mark Fasheh , Joel Becker , Changwei Ge , Gang He , Jun Piao , Andrew Morton , Linus Torvalds Subject: [PATCH 5.4 54/78] ocfs2: fix data corruption by fallocate Date: Tue, 8 Jun 2021 20:27:23 +0200 Message-Id: <20210608175937.106368315@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210608175935.254388043@linuxfoundation.org> References: <20210608175935.254388043@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: Junxiao Bi commit 6bba4471f0cc1296fe3c2089b9e52442d3074b2e upstream. When fallocate punches holes out of inode size, if original isize is in the middle of last cluster, then the part from isize to the end of the cluster will be zeroed with buffer write, at that time isize is not yet updated to match the new size, if writeback is kicked in, it will invoke ocfs2_writepage()->block_write_full_page() where the pages out of inode size will be dropped. That will cause file corruption. Fix this by zero out eof blocks when extending the inode size. Running the following command with qemu-image 4.2.1 can get a corrupted coverted image file easily. qemu-img convert -p -t none -T none -f qcow2 $qcow_image \ -O qcow2 -o compat=1.1 $qcow_image.conv The usage of fallocate in qemu is like this, it first punches holes out of inode size, then extend the inode size. fallocate(11, FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE, 2276196352, 65536) = 0 fallocate(11, 0, 2276196352, 65536) = 0 v1: https://www.spinics.net/lists/linux-fsdevel/msg193999.html v2: https://lore.kernel.org/linux-fsdevel/20210525093034.GB4112@quack2.suse.cz/T/ Link: https://lkml.kernel.org/r/20210528210648.9124-1-junxiao.bi@oracle.com Signed-off-by: Junxiao Bi Reviewed-by: Joseph Qi Cc: Jan Kara Cc: Mark Fasheh Cc: Joel Becker Cc: Changwei Ge Cc: Gang He Cc: Jun Piao Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- fs/ocfs2/file.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 5 deletions(-) --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -1856,6 +1856,45 @@ out: } /* + * zero out partial blocks of one cluster. + * + * start: file offset where zero starts, will be made upper block aligned. + * len: it will be trimmed to the end of current cluster if "start + len" + * is bigger than it. + */ +static int ocfs2_zeroout_partial_cluster(struct inode *inode, + u64 start, u64 len) +{ + int ret; + u64 start_block, end_block, nr_blocks; + u64 p_block, offset; + u32 cluster, p_cluster, nr_clusters; + struct super_block *sb = inode->i_sb; + u64 end = ocfs2_align_bytes_to_clusters(sb, start); + + if (start + len < end) + end = start + len; + + start_block = ocfs2_blocks_for_bytes(sb, start); + end_block = ocfs2_blocks_for_bytes(sb, end); + nr_blocks = end_block - start_block; + if (!nr_blocks) + return 0; + + cluster = ocfs2_bytes_to_clusters(sb, start); + ret = ocfs2_get_clusters(inode, cluster, &p_cluster, + &nr_clusters, NULL); + if (ret) + return ret; + if (!p_cluster) + return 0; + + offset = start_block - ocfs2_clusters_to_blocks(sb, cluster); + p_block = ocfs2_clusters_to_blocks(sb, p_cluster) + offset; + return sb_issue_zeroout(sb, p_block, nr_blocks, GFP_NOFS); +} + +/* * Parts of this function taken from xfs_change_file_space() */ static int __ocfs2_change_file_space(struct file *file, struct inode *inode, @@ -1865,7 +1904,7 @@ static int __ocfs2_change_file_space(str { int ret; s64 llen; - loff_t size; + loff_t size, orig_isize; struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); struct buffer_head *di_bh = NULL; handle_t *handle; @@ -1896,6 +1935,7 @@ static int __ocfs2_change_file_space(str goto out_inode_unlock; } + orig_isize = i_size_read(inode); switch (sr->l_whence) { case 0: /*SEEK_SET*/ break; @@ -1903,7 +1943,7 @@ static int __ocfs2_change_file_space(str sr->l_start += f_pos; break; case 2: /*SEEK_END*/ - sr->l_start += i_size_read(inode); + sr->l_start += orig_isize; break; default: ret = -EINVAL; @@ -1957,6 +1997,14 @@ static int __ocfs2_change_file_space(str default: ret = -EINVAL; } + + /* zeroout eof blocks in the cluster. */ + if (!ret && change_size && orig_isize < size) { + ret = ocfs2_zeroout_partial_cluster(inode, orig_isize, + size - orig_isize); + if (!ret) + i_size_write(inode, size); + } up_write(&OCFS2_I(inode)->ip_alloc_sem); if (ret) { mlog_errno(ret); @@ -1973,9 +2021,6 @@ static int __ocfs2_change_file_space(str goto out_inode_unlock; } - if (change_size && i_size_read(inode) < size) - i_size_write(inode, size); - inode->i_ctime = inode->i_mtime = current_time(inode); ret = ocfs2_mark_inode_dirty(handle, inode, di_bh); if (ret < 0)