Skip to content

Commit 4e2aa64

Browse files
djwonggregkh
authored andcommitted
xfs: prevent creating negative-sized file via INSERT_RANGE
commit 7d83fb1 upstream. During the "insert range" fallocate operation, i_size grows by the specified 'len' bytes. XFS verifies that i_size + len < s_maxbytes, as it should. But this comparison is done using the signed 'loff_t', and 'i_size + len' can wrap around to a negative value, causing the check to incorrectly pass, resulting in an inode with "negative" i_size. This is possible on 64-bit platforms, where XFS sets s_maxbytes = LLONG_MAX. ext4 and f2fs don't run into this because they set a smaller s_maxbytes. Fix it by using subtraction instead. Reproducer: xfs_io -f file -c "truncate $(((1<<63)-1))" -c "finsert 0 4096" Fixes: a904b1c ("xfs: Add support FALLOC_FL_INSERT_RANGE for fallocate") Cc: <stable@vger.kernel.org> # v4.1+ Originally-From: Eric Biggers <ebiggers@google.com> Signed-off-by: Eric Biggers <ebiggers@google.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> [darrick: fix signed integer addition overflow too] Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 779ae20 commit 4e2aa64

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

fs/xfs/xfs_file.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -969,22 +969,26 @@ xfs_file_fallocate(
969969
if (error)
970970
goto out_unlock;
971971
} else if (mode & FALLOC_FL_INSERT_RANGE) {
972-
unsigned int blksize_mask = i_blocksize(inode) - 1;
972+
unsigned int blksize_mask = i_blocksize(inode) - 1;
973+
loff_t isize = i_size_read(inode);
973974

974-
new_size = i_size_read(inode) + len;
975975
if (offset & blksize_mask || len & blksize_mask) {
976976
error = -EINVAL;
977977
goto out_unlock;
978978
}
979979

980-
/* check the new inode size does not wrap through zero */
981-
if (new_size > inode->i_sb->s_maxbytes) {
980+
/*
981+
* New inode size must not exceed ->s_maxbytes, accounting for
982+
* possible signed overflow.
983+
*/
984+
if (inode->i_sb->s_maxbytes - isize < len) {
982985
error = -EFBIG;
983986
goto out_unlock;
984987
}
988+
new_size = isize + len;
985989

986990
/* Offset should be less than i_size */
987-
if (offset >= i_size_read(inode)) {
991+
if (offset >= isize) {
988992
error = -EINVAL;
989993
goto out_unlock;
990994
}

0 commit comments

Comments
 (0)