udf: Truncate added extents on failed expansion

commit 70bfb3a8d661d4fdc742afc061b88a7f3fc9f500 upstream.

When a file expansion failed because we didn't have enough space for
indirect extents make sure we truncate extents created so far so that we
don't leave extents beyond EOF.

CC: stable@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jan Kara 2022-12-15 14:24:03 +01:00 committed by Greg Kroah-Hartman
parent dee96928d8
commit 4e41b1c5a2

View File

@ -528,8 +528,10 @@ static int udf_do_extend_file(struct inode *inode,
} }
if (fake) { if (fake) {
udf_add_aext(inode, last_pos, &last_ext->extLocation, err = udf_add_aext(inode, last_pos, &last_ext->extLocation,
last_ext->extLength, 1); last_ext->extLength, 1);
if (err < 0)
goto out_err;
count++; count++;
} else { } else {
struct kernel_lb_addr tmploc; struct kernel_lb_addr tmploc;
@ -563,7 +565,7 @@ static int udf_do_extend_file(struct inode *inode,
err = udf_add_aext(inode, last_pos, &last_ext->extLocation, err = udf_add_aext(inode, last_pos, &last_ext->extLocation,
last_ext->extLength, 1); last_ext->extLength, 1);
if (err) if (err)
return err; goto out_err;
count++; count++;
} }
if (new_block_bytes) { if (new_block_bytes) {
@ -572,7 +574,7 @@ static int udf_do_extend_file(struct inode *inode,
err = udf_add_aext(inode, last_pos, &last_ext->extLocation, err = udf_add_aext(inode, last_pos, &last_ext->extLocation,
last_ext->extLength, 1); last_ext->extLength, 1);
if (err) if (err)
return err; goto out_err;
count++; count++;
} }
@ -586,6 +588,11 @@ static int udf_do_extend_file(struct inode *inode,
return -EIO; return -EIO;
return count; return count;
out_err:
/* Remove extents we've created so far */
udf_clear_extent_cache(inode);
udf_truncate_extents(inode);
return err;
} }
/* Extend the final block of the file to final_block_len bytes */ /* Extend the final block of the file to final_block_len bytes */