All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org,
	"Darrick J. Wong" <darrick.wong@oracle.com>,
	Christoph Hellwig <hch@lst.de>,
	"Darrick J. Wong" <djwong@kernel.org>,
	Chandan Babu R <chandan.babu@oracle.com>
Subject: [PATCH 5.4 41/51] xfs: fix s_maxbytes computation on 32-bit kernels
Date: Wed,  5 Oct 2022 13:32:29 +0200	[thread overview]
Message-ID: <20221005113212.190566979@linuxfoundation.org> (raw)
In-Reply-To: <20221005113210.255710920@linuxfoundation.org>

From: "Darrick J. Wong" <darrick.wong@oracle.com>

commit 932befe39ddea29cf47f4f1dc080d3dba668f0ca upstream.

I observed a hang in generic/308 while running fstests on a i686 kernel.
The hang occurred when trying to purge the pagecache on a large sparse
file that had a page created past MAX_LFS_FILESIZE, which caused an
integer overflow in the pagecache xarray and resulted in an infinite
loop.

I then noticed that Linus changed the definition of MAX_LFS_FILESIZE in
commit 0cc3b0ec23ce ("Clarify (and fix) MAX_LFS_FILESIZE macros") so
that it is now one page short of the maximum page index on 32-bit
kernels.  Because the XFS function to compute max offset open-codes the
2005-era MAX_LFS_FILESIZE computation and neither the vfs nor mm perform
any sanity checking of s_maxbytes, the code in generic/308 can create a
page above the pagecache's limit and kaboom.

Fix all this by setting s_maxbytes to MAX_LFS_FILESIZE directly and
aborting the mount with a warning if our assumptions ever break.  I have
no answer for why this seems to have been broken for years and nobody
noticed.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 fs/xfs/xfs_super.c |   48 +++++++++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -512,32 +512,6 @@ xfs_showargs(
 		seq_puts(m, ",noquota");
 }
 
-static uint64_t
-xfs_max_file_offset(
-	unsigned int		blockshift)
-{
-	unsigned int		pagefactor = 1;
-	unsigned int		bitshift = BITS_PER_LONG - 1;
-
-	/* Figure out maximum filesize, on Linux this can depend on
-	 * the filesystem blocksize (on 32 bit platforms).
-	 * __block_write_begin does this in an [unsigned] long long...
-	 *      page->index << (PAGE_SHIFT - bbits)
-	 * So, for page sized blocks (4K on 32 bit platforms),
-	 * this wraps at around 8Tb (hence MAX_LFS_FILESIZE which is
-	 *      (((u64)PAGE_SIZE << (BITS_PER_LONG-1))-1)
-	 * but for smaller blocksizes it is less (bbits = log2 bsize).
-	 */
-
-#if BITS_PER_LONG == 32
-	ASSERT(sizeof(sector_t) == 8);
-	pagefactor = PAGE_SIZE;
-	bitshift = BITS_PER_LONG;
-#endif
-
-	return (((uint64_t)pagefactor) << bitshift) - 1;
-}
-
 /*
  * Set parameters for inode allocation heuristics, taking into account
  * filesystem size and inode32/inode64 mount options; i.e. specifically
@@ -1650,6 +1624,26 @@ xfs_fs_fill_super(
 	if (error)
 		goto out_free_sb;
 
+	/*
+	 * XFS block mappings use 54 bits to store the logical block offset.
+	 * This should suffice to handle the maximum file size that the VFS
+	 * supports (currently 2^63 bytes on 64-bit and ULONG_MAX << PAGE_SHIFT
+	 * bytes on 32-bit), but as XFS and VFS have gotten the s_maxbytes
+	 * calculation wrong on 32-bit kernels in the past, we'll add a WARN_ON
+	 * to check this assertion.
+	 *
+	 * Avoid integer overflow by comparing the maximum bmbt offset to the
+	 * maximum pagecache offset in units of fs blocks.
+	 */
+	if (XFS_B_TO_FSBT(mp, MAX_LFS_FILESIZE) > XFS_MAX_FILEOFF) {
+		xfs_warn(mp,
+"MAX_LFS_FILESIZE block offset (%llu) exceeds extent map maximum (%llu)!",
+			 XFS_B_TO_FSBT(mp, MAX_LFS_FILESIZE),
+			 XFS_MAX_FILEOFF);
+		error = -EINVAL;
+		goto out_free_sb;
+	}
+
 	error = xfs_filestream_mount(mp);
 	if (error)
 		goto out_free_sb;
@@ -1661,7 +1655,7 @@ xfs_fs_fill_super(
 	sb->s_magic = XFS_SUPER_MAGIC;
 	sb->s_blocksize = mp->m_sb.sb_blocksize;
 	sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1;
-	sb->s_maxbytes = xfs_max_file_offset(sb->s_blocksize_bits);
+	sb->s_maxbytes = MAX_LFS_FILESIZE;
 	sb->s_max_links = XFS_MAXLINK;
 	sb->s_time_gran = 1;
 	sb->s_time_min = S32_MIN;



  parent reply	other threads:[~2022-10-05 11:37 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-05 11:31 [PATCH 5.4 00/51] 5.4.217-rc1 review Greg Kroah-Hartman
2022-10-05 11:31 ` [PATCH 5.4 01/51] Revert "x86/speculation: Add RSB VM Exit protections" Greg Kroah-Hartman
2022-10-05 11:31 ` [PATCH 5.4 02/51] Revert "x86/cpu: Add a steppings field to struct x86_cpu_id" Greg Kroah-Hartman
2022-10-05 11:31 ` [PATCH 5.4 03/51] x86/devicetable: Move x86 specific macro out of generic code Greg Kroah-Hartman
2022-10-05 11:31 ` [PATCH 5.4 04/51] x86/cpu: Add consistent CPU match macros Greg Kroah-Hartman
2022-10-05 11:31 ` [PATCH 5.4 05/51] x86/cpu: Add a steppings field to struct x86_cpu_id Greg Kroah-Hartman
2022-10-05 11:31 ` [PATCH 5.4 06/51] x86/kvm/vmx: Make noinstr clean Greg Kroah-Hartman
2022-10-05 11:31 ` [PATCH 5.4 07/51] x86/cpufeatures: Move RETPOLINE flags to word 11 Greg Kroah-Hartman
2022-10-05 11:31 ` [PATCH 5.4 08/51] x86/bugs: Report AMD retbleed vulnerability Greg Kroah-Hartman
2022-10-05 11:31 ` [PATCH 5.4 09/51] x86/bugs: Add AMD retbleed= boot parameter Greg Kroah-Hartman
2022-10-05 11:31 ` [PATCH 5.4 10/51] x86/bugs: Keep a per-CPU IA32_SPEC_CTRL value Greg Kroah-Hartman
2022-10-05 11:31 ` [PATCH 5.4 11/51] x86/entry: Remove skip_r11rcx Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 12/51] x86/entry: Add kernel IBRS implementation Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 13/51] x86/bugs: Optimize SPEC_CTRL MSR writes Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 14/51] x86/speculation: Add spectre_v2=ibrs option to support Kernel IBRS Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 15/51] x86/bugs: Split spectre_v2_select_mitigation() and spectre_v2_user_select_mitigation() Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 16/51] x86/bugs: Report Intel retbleed vulnerability Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 17/51] intel_idle: Disable IBRS during long idle Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 18/51] x86/speculation: Change FILL_RETURN_BUFFER to work with objtool Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 19/51] x86/speculation: Fix RSB filling with CONFIG_RETPOLINE=n Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 20/51] x86/speculation: Fix firmware entry SPEC_CTRL handling Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 21/51] x86/speculation: Fix SPEC_CTRL write on SMT state change Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 22/51] x86/speculation: Use cached host SPEC_CTRL value for guest entry/exit Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 23/51] x86/speculation: Remove x86_spec_ctrl_mask Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 24/51] KVM/VMX: Use TEST %REG,%REG instead of CMP $0,%REG in vmenter.S Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 25/51] KVM/nVMX: Use __vmx_vcpu_run in nested_vmx_check_vmentry_hw Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 26/51] KVM: VMX: Flatten __vmx_vcpu_run() Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 27/51] KVM: VMX: Convert launched argument to flags Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 28/51] KVM: VMX: Prevent guest RSB poisoning attacks with eIBRS Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 29/51] KVM: VMX: Fix IBRS handling after vmexit Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 30/51] x86/speculation: Fill RSB on vmexit for IBRS Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 31/51] x86/common: Stamp out the stepping madness Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 32/51] x86/cpu/amd: Enumerate BTC_NO Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 33/51] x86/bugs: Add Cannon lake to RETBleed affected CPU list Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 34/51] x86/speculation: Disable RRSBA behavior Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 35/51] x86/speculation: Use DECLARE_PER_CPU for x86_spec_ctrl_current Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 36/51] x86/bugs: Warn when "ibrs" mitigation is selected on Enhanced IBRS parts Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 37/51] x86/speculation: Add RSB VM Exit protections Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 38/51] xfs: fix misuse of the XFS_ATTR_INCOMPLETE flag Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 39/51] xfs: introduce XFS_MAX_FILEOFF Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 40/51] xfs: truncate should remove all blocks, not just to the end of the page cache Greg Kroah-Hartman
2022-10-05 11:32 ` Greg Kroah-Hartman [this message]
2022-10-05 11:32 ` [PATCH 5.4 42/51] xfs: fix IOCB_NOWAIT handling in xfs_file_dio_aio_read Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 43/51] xfs: refactor remote attr value buffer invalidation Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 44/51] xfs: fix memory corruption during " Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 45/51] xfs: move incore structures out of xfs_da_format.h Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 46/51] xfs: streamline xfs_attr3_leaf_inactive Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 47/51] xfs: fix uninitialized variable in xfs_attr3_leaf_inactive Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 48/51] xfs: remove unused variable done Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 49/51] Revert "drm/amdgpu: use dirty framebuffer helper" Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 50/51] Makefile.extrawarn: Move -Wcast-function-type-strict to W=1 Greg Kroah-Hartman
2022-10-05 11:32 ` [PATCH 5.4 51/51] docs: update mediator information in CoC docs Greg Kroah-Hartman
2022-10-05 19:12 ` [PATCH 5.4 00/51] 5.4.217-rc1 review Daniel Díaz
2022-10-05 19:29   ` Thadeu Lima de Souza Cascardo
2022-10-05 19:29 ` Guenter Roeck
2022-10-06  9:32 ` Jon Hunter
2022-10-06 19:02 ` Naresh Kamboju
2022-10-06 19:39 ` Slade Watkins
2022-10-06 20:01 ` Allen Pais
2022-10-07 14:35 ` zhouzhixiu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221005113212.190566979@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=chandan.babu@oracle.com \
    --cc=darrick.wong@oracle.com \
    --cc=djwong@kernel.org \
    --cc=hch@lst.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.