| From 36c08ae353bc14dd1301a213cfb2ba489203bb6f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 23 Jan 2023 14:29:15 +0100 |
| Subject: udf: Fix off-by-one error when discarding preallocation |
| |
| From: Jan Kara <jack@suse.cz> |
| |
| [ Upstream commit f54aa97fb7e5329a373f9df4e5e213ced4fc8759 ] |
| |
| 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@vger.kernel.org |
| Fixes: 16d055656814 ("udf: Discard preallocation before extending file with a hole") |
| Signed-off-by: Jan Kara <jack@suse.cz> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| fs/udf/inode.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/fs/udf/inode.c b/fs/udf/inode.c |
| index 259152a08852b..a4e875b61f895 100644 |
| --- a/fs/udf/inode.c |
| +++ b/fs/udf/inode.c |
| @@ -443,7 +443,7 @@ static int udf_get_block(struct inode *inode, sector_t block, |
| * Block beyond EOF and prealloc extents? Just discard preallocation |
| * as it is not useful and complicates things. |
| */ |
| - if (((loff_t)block) << inode->i_blkbits > iinfo->i_lenExtents) |
| + if (((loff_t)block) << inode->i_blkbits >= iinfo->i_lenExtents) |
| udf_discard_prealloc(inode); |
| udf_clear_extent_cache(inode); |
| phys = inode_getblk(inode, block, &err, &new); |
| -- |
| 2.39.2 |
| |
