This is a note to let you know that I've just added the patch titled
udf: Fix file corruption when appending just after end of preallocated extent
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
udf-fix-file-corruption-when-appending-just-after-end-of-preallocated-extent.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 36ec52ea038b18a53e198116ef7d7e70c87db046 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@xxxxxxx>
Date: Mon, 23 Jan 2023 14:18:47 +0100
Subject: udf: Fix file corruption when appending just after end of preallocated extent
From: Jan Kara <jack@xxxxxxx>
commit 36ec52ea038b18a53e198116ef7d7e70c87db046 upstream.
When we append new block just after the end of preallocated extent, the
code in inode_getblk() wrongly determined we're going to use the
preallocated extent which resulted in adding block into a wrong logical
offset in the file. Sequence like this manifests it:
xfs_io -f -c "pwrite 0x2cacf 0xd122" -c "truncate 0x2dd6f" \
-c "pwrite 0x27fd9 0x69a9" -c "pwrite 0x32981 0x7244" <file>
The code that determined the use of preallocated extent is actually
stale because udf_do_extend_file() does not create preallocation anymore
so after calling that function we are sure there's no usable
preallocation. Just remove the faulty condition.
CC: stable@xxxxxxxxxxxxxxx
Fixes: 16d055656814 ("udf: Discard preallocation before extending file with a hole")
Signed-off-by: Jan Kara <jack@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/udf/inode.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -805,19 +805,17 @@ static sector_t inode_getblk(struct inod
c = 0;
offset = 0;
count += ret;
- /* We are not covered by a preallocated extent? */
- if ((laarr[0].extLength & UDF_EXTENT_FLAG_MASK) !=
- EXT_NOT_RECORDED_ALLOCATED) {
- /* Is there any real extent? - otherwise we overwrite
- * the fake one... */
- if (count)
- c = !c;
- laarr[c].extLength = EXT_NOT_RECORDED_NOT_ALLOCATED |
- inode->i_sb->s_blocksize;
- memset(&laarr[c].extLocation, 0x00,
- sizeof(struct kernel_lb_addr));
- count++;
- }
+ /*
+ * Is there any real extent? - otherwise we overwrite the fake
+ * one...
+ */
+ if (count)
+ c = !c;
+ laarr[c].extLength = EXT_NOT_RECORDED_NOT_ALLOCATED |
+ inode->i_sb->s_blocksize;
+ memset(&laarr[c].extLocation, 0x00,
+ sizeof(struct kernel_lb_addr));
+ count++;
endnum = c + 1;
lastblock = 1;
} else {
Patches currently in stable-queue which might be from jack@xxxxxxx are
queue-6.1/sbitmap-use-single-per-bitmap-counting-to-wake-up-qu.patch
queue-6.1/udf-fix-file-corruption-when-appending-just-after-end-of-preallocated-extent.patch
queue-6.1/sbitmap-correct-wake_batch-recalculation-to-avoid-po.patch
queue-6.1/udf-do-not-update-file-length-for-failed-writes-to-inline-files.patch
queue-6.1/udf-truncate-added-extents-on-failed-expansion.patch
queue-6.1/udf-detect-system-inodes-linked-into-directory-hierarchy.patch
queue-6.1/udf-do-not-bother-merging-very-long-extents.patch
queue-6.1/udf-define-efscorrupted-error-code.patch
queue-6.1/sbitmap-remove-redundant-check-in-__sbitmap_queue_ge.patch
queue-6.1/udf-preserve-link-count-of-system-files.patch
