The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x f54aa97fb7e5329a373f9df4e5e213ced4fc8759 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '167811000815093@xxxxxxxxx' --subject-prefix 'PATCH 4.14.y' HEAD^.. Possible dependencies: f54aa97fb7e5 ("udf: Fix off-by-one error when discarding preallocation") f3a30be77750 ("udf: Factor out block mapping into udf_map_block()") a27b2923de7e ("udf: Move udf_expand_dir_adinicb() to its callsite") 57bda9fb169d ("udf: Convert udf_expand_dir_adinicb() to new directory iteration") 16d055656814 ("udf: Discard preallocation before extending file with a hole") 979a6e28dd96 ("udf: Get rid of 0-length arrays in struct fileIdentDesc") 63c9e47a1642 ("udf: fix silent AED tagLocation corruption") 382a2287bf9c ("udf: Remove pointless union in udf_inode_info") 044e2e26f214 ("udf: Avoid accessing uninitialized data on failed inode read") c3367a1b47d5 ("udf: augment UDF permissions on new inodes") ab9a3a737284 ("udf: reduce leakage of blocks related to named streams") fa33cdbf3ece ("udf: Fix incorrect final NOT_ALLOCATED (hole) extent length") c3b9cecd89b8 ("udf: convert inode stamps to timespec64") f2e83347119a ("udf: Provide function for calculating dir entry length") 95582b008388 ("vfs: change inode times to use struct timespec64") 0220eddac66d ("udf: Simplify calls to udf_disk_stamp_to_time") 0a2dfbecb361 ("fs: nfs: get rid of memcpys for inode times") 13442b036a13 ("ceph: make inode time prints to be long long") 8efd6894ff08 ("fs: add timespec64_truncate()") ffdeec7aa41a ("ceph: always update atime/mtime/ctime for new inode") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From f54aa97fb7e5329a373f9df4e5e213ced4fc8759 Mon Sep 17 00:00:00 2001 From: Jan Kara <jack@xxxxxxx> Date: Mon, 23 Jan 2023 14:29:15 +0100 Subject: [PATCH] udf: Fix off-by-one error when discarding preallocation The condition determining whether the preallocation can be used had an off-by-one error so we didn't discard preallocation when new allocation was just following it. This can then confuse code in inode_getblk(). CC: stable@xxxxxxxxxxxxxxx Fixes: 16d055656814 ("udf: Discard preallocation before extending file with a hole") Signed-off-by: Jan Kara <jack@xxxxxxx> diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 51deada8b928..ee440d16411e 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -361,7 +361,7 @@ static int udf_map_block(struct inode *inode, struct udf_map_rq *map) * Block beyond EOF and prealloc extents? Just discard preallocation * as it is not useful and complicates things. */ - if (((loff_t)map->lblk) << inode->i_blkbits > iinfo->i_lenExtents) + if (((loff_t)map->lblk) << inode->i_blkbits >= iinfo->i_lenExtents) udf_discard_prealloc(inode); udf_clear_extent_cache(inode); err = inode_getblk(inode, map);
