Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp3847397pxb; Tue, 17 Nov 2020 05:18:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJyOMzmiZep919VUd5Eq4UhQxPzh6ayNKgem9wbnMW3QgwP6jvg2B/xTC6rLafviIrewCH+3 X-Received: by 2002:a50:e0c9:: with SMTP id j9mr15304291edl.380.1605619080337; Tue, 17 Nov 2020 05:18:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605619080; cv=none; d=google.com; s=arc-20160816; b=0gaabV1IqSqNe1nwz2FZmKJ4CyC1K7oCzDSiratXQXGGllCpzFUCAmtTfhQYv4nSAi zDVUgppUUywr+fWFkOQs7FX2iXVVRUT2qJJ4PjKICur0C03sxOZaCY7/Ojd4KY90gDPX /P1db4UVNBZyzeqZhJhIg2zyT64/WC48Bw9Cwqgm907AMXqVT4D7GA1iXRAx26gxuoyJ 9daaeN9OltU8FcURQQwMHEQFAZepzkAsvrY//2xcG6ZrfInrTgpY8n5cJW1PZAZx9n8R rFzl4dLczl+qq6VNtyLNPQwQ6H6jTgT/c2AJ6WsWmOO5ADV+m8KFhXomAzE8cqKDso42 Mrig== 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=KrqiHQoCCnpzepDCnKYR52D6gqmjkKI9O3+nyzuYhGg=; b=fnxym0EB9NiDosYwrtWZHyeQFc9YQqKMCLFv0zSnX3UgX0bAnB5JTOeBi/XiorO6Nm NCbsjAAeIG1r/E5xxBDxZJ/QPP4E+W6wWg7/taoRlOEDce2MllswMHLHacZOALFfpdcy mvkToepdf9Qs/p6udErtBLuIk21UB20SiLiWAZ9Tpqvl4hSZ+zvSUqV/jw3rm9BgqnX2 8GkCoEKzbCca8r4QLb7R2bR6n/kP03q75Xaz2Ij5kJaC4dNFK9hEHIBBAHxaAxhhIIOU G0JdB6V+vpLNGvYG69h9GFDYtIRH0fQxtPrHJTVI5YpdoEF0UcE9D5JnsMYD0VX9dodm PfLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="y+30f/Yv"; 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=fail (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 cz6si16211589edb.297.2020.11.17.05.17.36; Tue, 17 Nov 2020 05:18:00 -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=@kernel.org header.s=default header.b="y+30f/Yv"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729970AbgKQNNy (ORCPT + 99 others); Tue, 17 Nov 2020 08:13:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:44366 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729941AbgKQNNr (ORCPT ); Tue, 17 Nov 2020 08:13:47 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 E73EA2151B; Tue, 17 Nov 2020 13:13:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605618826; bh=j+q9e5I7bDq0E+WLqGswa+faDIMGj7OmgmhmlzHZOfY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y+30f/YvTgzpLtngmn+qr/zHYyHMWZUCHcs3hYPnQ7DBu5FslV8yRB55LWCGQD0hA DfCK5P4+SXWnIJvSe4OF+VbjcTxsxrd7v34VpN3zoUc/URpHBjCEF7G4maDrrF6Qry R8r1XPhEsAgqgfXBTE2Z5m34Wkc35PJOEOpXffKQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Brian Foster , "Darrick J. Wong" , Sasha Levin Subject: [PATCH 4.14 20/85] xfs: flush new eof page on truncate to avoid post-eof corruption Date: Tue, 17 Nov 2020 14:04:49 +0100 Message-Id: <20201117122112.026112733@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201117122111.018425544@linuxfoundation.org> References: <20201117122111.018425544@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: Brian Foster [ Upstream commit 869ae85dae64b5540e4362d7fe4cd520e10ec05c ] It is possible to expose non-zeroed post-EOF data in XFS if the new EOF page is dirty, backed by an unwritten block and the truncate happens to race with writeback. iomap_truncate_page() will not zero the post-EOF portion of the page if the underlying block is unwritten. The subsequent call to truncate_setsize() will, but doesn't dirty the page. Therefore, if writeback happens to complete after iomap_truncate_page() (so it still sees the unwritten block) but before truncate_setsize(), the cached page becomes inconsistent with the on-disk block. A mapped read after the associated page is reclaimed or invalidated exposes non-zero post-EOF data. For example, consider the following sequence when run on a kernel modified to explicitly flush the new EOF page within the race window: $ xfs_io -fc "falloc 0 4k" -c fsync /mnt/file $ xfs_io -c "pwrite 0 4k" -c "truncate 1k" /mnt/file ... $ xfs_io -c "mmap 0 4k" -c "mread -v 1k 8" /mnt/file 00000400: 00 00 00 00 00 00 00 00 ........ $ umount /mnt/; mount /mnt/ $ xfs_io -c "mmap 0 4k" -c "mread -v 1k 8" /mnt/file 00000400: cd cd cd cd cd cd cd cd ........ Update xfs_setattr_size() to explicitly flush the new EOF page prior to the page truncate to ensure iomap has the latest state of the underlying block. Fixes: 68a9f5e7007c ("xfs: implement iomap based buffered write path") Signed-off-by: Brian Foster Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Signed-off-by: Sasha Levin --- fs/xfs/xfs_iops.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index 4e6f2c8574f7e..42c670a313518 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -879,6 +879,16 @@ xfs_setattr_size( if (newsize > oldsize) { error = xfs_zero_eof(ip, newsize, oldsize, &did_zeroing); } else { + /* + * iomap won't detect a dirty page over an unwritten block (or a + * cow block over a hole) and subsequently skips zeroing the + * newly post-EOF portion of the page. Flush the new EOF to + * convert the block before the pagecache truncate. + */ + error = filemap_write_and_wait_range(inode->i_mapping, newsize, + newsize); + if (error) + return error; error = iomap_truncate_page(inode, newsize, &did_zeroing, &xfs_iomap_ops); } -- 2.27.0