udf: Fix incorrect final NOT_ALLOCATED (hole) extent length
PATCH v2 1/1 udf: Fix incorrect final NOT_ALLOCATED (hole) extent length
In some cases, using the 'truncate' command to extend a UDF file results in a mismatch between the length of the file's extents (specifically, due to incorrect length of the final NOT_ALLOCATED extent) and the information (file) length. The discrepancy can prevent other operating systems (i.e., Windows 10) from opening the file.
Two particular errors have been observed when extending a file:
1. The final extent is larger than it should be, having been rounded up to a multiple of the block size.
B. The final extent is not shorter than it should be, due to not having
been updated when the file's information length was increased.
Change since v1:
Simplified udf_do_extend_file() API, partially by factoring out its handling of the "extending within the last file block" corner case.
fs/udf/inode.c +79 -32
@@ -470,13 +470,15 @@ static struct buffer_head *udf_getblk(streturn NULL ; } -/* Extend the file by 'blocks' blocks, return the number of extents added */ +/* Extend the file with new blocks totaling 'new_block_bytes', +* return the number of extents added +*/ static int udf_do_extend_file (struct inode *inode,struct extent_position *last_pos,struct kernel_long_ad *last_ext, -sector_t blocks) +loff_t new_block_bytes) { -sector_t add; +unsigned long add;int count =0 , fake = !(last_ext->extLength &UDF_EXTENT_LENGTH_MASK );struct super_block *sb = inode->i_sb;struct kernel_lb_addr prealloc_loc = {};
@@ -486,7 +488,7 @@ static int udf_do_extend_file(struct ino/* The previous extent is fake and we should not extend by anything * - there's nothing to do... */ -if (!blocks && fake) +if (!new_block_bytes && fake)return 0 ; iinfo =UDF_I (inode);
@@ -517,13 +519,12 @@ static int udf_do_extend_file(struct ino/* Can we merge with the previous extent? */ if ((last_ext->extLength &UDF_EXTENT_FLAG_MASK ) ==EXT_NOT_RECORDED_NOT_ALLOCATED ) { - add = ((1 <<30 ) - sb->s_blocksize - - (last_ext->extLength &UDF_EXTENT_LENGTH_MASK )) >> - sb->s_blocksize_bits; -if (add > blocks) - add = blocks; - blocks -= add; - last_ext->extLength += add << sb->s_blocksize_bits; + add = (1 <<30 ) - sb->s_blocksize - + (last_ext->extLength &UDF_EXTENT_LENGTH_MASK ); +if (add > new_block_bytes) + add = new_block_bytes; + new_block_bytes -= add; + last_ext->extLength += add; }if (fake) {
@@ -544,28 +545,27 @@ static int udf_do_extend_file(struct ino }/* Managed to do everything necessary? */ -if (!blocks) +if (!new_block_bytes) goto out;/* All further extents will be NOT_RECORDED_NOT_ALLOCATED */ last_ext->extLocation.logicalBlockNum =0 ; last_ext->extLocation.partitionReferenceNum =0 ; - add = (1 << (30 -sb->s_blocksize_bits)) -1 ; - last_ext->extLength =EXT_NOT_RECORDED_NOT_ALLOCATED | - (add << sb->s_blocksize_bits); + add = (1 <<30 ) - sb->s_blocksize; + last_ext->extLength =EXT_NOT_RECORDED_NOT_ALLOCATED | add;/* Create enough extents to cover the whole hole */ -while (blocks > add) { - blocks -= add; +while (new_block_bytes > add) { + new_block_bytes -= add; err =udf_add_aext (inode, last_pos, &last_ext->extLocation, last_ext->extLength,1 );if (err)return err; count++; } -if (blocks) { +if (new_block_bytes) { last_ext->extLength =EXT_NOT_RECORDED_NOT_ALLOCATED | - (blocks << sb->s_blocksize_bits); + new_block_bytes; err =udf_add_aext (inode, last_pos, &last_ext->extLocation, last_ext->extLength,1 );if (err)
@@ -596,6 +596,44 @@ out:return count; } +/* Extend the final block of the file to final_block_len bytes */ +static int udf_do_extend_final_block (struct inode *inode, +struct extent_position *last_pos, +struct kernel_long_ad *last_ext, +unsigned long final_block_len) +{ +struct super_block *sb = inode->i_sb; +struct kernel_lb_addr tmploc; +uint32_t tmplen; +struct udf_inode_info *iinfo; +unsigned long added_bytes; + + iinfo =UDF_I (inode); + + added_bytes = final_block_len - + (last_ext->extLength & (sb->s_blocksize -1 )); + last_ext->extLength += added_bytes; + iinfo->i_lenExtents += added_bytes; + +udf_write_aext (inode, last_pos, &last_ext->extLocation, + last_ext->extLength,1 ); +/* +* We've rewritten the last extent but there may be empty +* indirect extent after it - enter it. +*/ +udf_next_aext (inode, last_pos, &tmploc, &tmplen,0 ); + +/* last_pos should point to the last written extent... */ +if (iinfo->i_alloc_type ==ICBTAG_FLAG_AD_SHORT ) + last_pos->offset -=sizeof (struct short_ad ); +else if (iinfo->i_alloc_type ==ICBTAG_FLAG_AD_LONG ) + last_pos->offset -=sizeof (struct long_ad ); +else +return -EIO ; + +return 0 ; +} +static int udf_extend_file (struct inode *inode,loff_t newsize) {
@@ -605,10 +643,12 @@ static int udf_extend_file(struct inodeint8_t etype;struct super_block *sb = inode->i_sb;sector_t first_block = newsize >> sb->s_blocksize_bits, offset; +unsigned long partial_final_block;int adsize;struct udf_inode_info *iinfo =UDF_I (inode);struct kernel_long_ad extent;int err; +int within_final_block;if (iinfo->i_alloc_type ==ICBTAG_FLAG_AD_SHORT ) adsize =sizeof (struct short_ad );
@@ -618,18 +658,8 @@ static int udf_extend_file(struct inodeBUG (); etype =inode_bmap (inode, first_block, &epos, &eloc, &elen, &offset); + within_final_block = (etype !=-1 ); -/* File has extent covering the new size (could happen when extending -* inside a block)? */ -if (etype !=-1 ) -return 0 ; -if (newsize & (sb->s_blocksize -1 )) - offset++; -/* Extended file just to the boundary of the last file block? */ -if (offset ==0 ) -return 0 ; - -/* Truncate is extending the file by 'offset' blocks */ if ((!epos.bh && epos.offset ==udf_file_entry_alloc_offset (inode)) || (epos.bh && epos.offset ==sizeof (struct allocExtDesc ))) {/* File has no extents at all or has empty last
@@ -643,7 +673,22 @@ static int udf_extend_file(struct inode &extent.extLength, 0); extent.extLength |= etype <<30 ; } - err =udf_do_extend_file (inode, &epos, &extent, offset); + + partial_final_block = newsize & (sb->s_blocksize -1 ); + +/* File has extent covering the new size (could happen when extending +* inside a block)? +*/ +if (within_final_block) { +/* Extending file within the last file block */ + err =udf_do_extend_final_block (inode, &epos, &extent, + partial_final_block); + }else { +loff_t add = (offset << sb->s_blocksize_bits) | + partial_final_block; + err =udf_do_extend_file (inode, &epos, &extent, add); + } +if (err <0 ) goto out; err =0 ;
@@ -745,6 +790,7 @@ static sector_t inode_getblk(struct inod/* Are we beyond EOF? */ if (etype ==-1 ) {int ret; +loff_t hole_len; isBeyondEOF = true;if (count) {if (c)
@@ -760,7 +806,8 @@ static sector_t inode_getblk(struct inod startnum = (offset >0 ); }/* Create extents for the hole between EOF and offset */ - ret =udf_do_extend_file (inode, &prev_epos, laarr, offset); + hole_len = offset << inode->i_sb->s_blocksize_bits; + ret =udf_do_extend_file (inode, &prev_epos, laarr, hole_len);if (ret <0 ) { *err = ret; newblock =0 ;
Quoted 14 lines · Steven J. Magnani
In some cases, using the 'truncate' command to extend a UDF file results in a mismatch between the length of the file's extents (specifically, due to incorrect length of the final
NOT_ALLOCATEDextent) and the information (file) length. The discrepancy can prevent other operating systems (i.e., Windows 10) from opening the file.Two particular errors have been observed when extending a file:
1. The final extent is larger than it should be, having been rounded up to a multiple of the block size.
B. The final extent is not shorter than it should be, due to not having
been updated when the file's information length was increased.
Quoted 6 lines
Change since v1:
Simplifiedudf_do_extend_file()API, partially by factoring out its handling of the "extending within the last file block" corner case.Fixes 2c948b3f86e5 ("udf: Avoid IO in udf_clear_inode")Signed-off-by Steven J. Magnani <[email protected]>
Thanks for the patch! I have added it with some small modifications to my tree. Below are the changes I did.
Quoted 8 lines
fs/udf/inode.c +1
-1@@ -470,13 +470,15 @@ static struct buffer_head *udf_getblk(streturn NULL ; } -/* Extend the file by 'blocks' blocks, return the number of extents added */ +/* Extend the file with new blocks totaling 'new_block_bytes',
fs/udf/inode.c static struct buffer_head *udf_getblk(st · line 481
Quoted 10 lines
fs/udf/inode.c +4
-2+* return the number of extents added +*/ static int udf_do_extend_file (struct inode *inode,struct extent_position *last_pos,struct kernel_long_ad *last_ext, -sector_t blocks) +loff_t new_block_bytes) { -sector_t add; +unsigned long add;
I've changed the type here to uint32_t since that's what we usually use for extent size.
fs/udf/inode.c out: · line 600
Quoted 2 lines
fs/udf/inode.c +2
-0+/* Extend the final block of the file to final_block_len bytes */ +static int udf_do_extend_final_block(struct inode *inode,
Changed return type to void since the function doesn't return anything useful.
Quoted 22 lines
fs/udf/inode.c +22
-0+struct extent_position *last_pos, + struct kernel_long_ad *last_ext, + unsigned long final_block_len) +{ + struct super_block *sb = inode->i_sb; +struct kernel_lb_addr tmploc; +uint32_t tmplen; +struct udf_inode_info *iinfo; +unsigned long added_bytes; + + iinfo =UDF_I (inode); + + added_bytes = final_block_len - + (last_ext->extLength & (sb->s_blocksize -1 )); + last_ext->extLength += added_bytes; + iinfo->i_lenExtents += added_bytes; + +udf_write_aext (inode, last_pos, &last_ext->extLocation, + last_ext->extLength,1 ); +/* +* We've rewritten the last extent but there may be empty +* indirect extent after it - enter it.
fs/udf/inode.c out: · line 632
Quoted 10 lines
fs/udf/inode.c +10
-0+*/ +udf_next_aext (inode, last_pos, &tmploc, &tmplen,0 ); + +/* last_pos should point to the last written extent... */ +if (iinfo->i_alloc_type ==ICBTAG_FLAG_AD_SHORT ) + last_pos->offset -=sizeof (struct short_ad ); +else if (iinfo->i_alloc_type ==ICBTAG_FLAG_AD_LONG ) + last_pos->offset -=sizeof (struct long_ad ); +else +return -EIO ;
I've dropped the updates of last_pos here. This function is used from a single place and passed epos isn't used in any way after the function returns.
fs/udf/inode.c static int udf_extend_file(struct inode · line 646
Quoted 12 lines
fs/udf/inode.c +5
-0+ +return 0 ; +} +static int udf_extend_file (struct inode *inode,loff_t newsize) {@@ -605,10 +643,12 @@ static int udf_extend_file(struct inodeint8_t etype;struct super_block *sb = inode->i_sb;sector_t first_block = newsize >> sb->s_blocksize_bits, offset; +unsigned long partial_final_block;
Again uint32_t here.
Quoted 7 lines
fs/udf/inode.c +2
-1@@ -643,7 +673,22 @@ static int udf_extend_file(struct inode &extent.extLength, 0); extent.extLength |= etype <<30 ; } - err =udf_do_extend_file (inode, &epos, &extent, offset); + + partial_final_block = newsize & (sb->s_blocksize -1 );
fs/udf/inode.c static int udf_extend_file(struct inode · line 687
Quoted 10 lines
fs/udf/inode.c +10
-0+ +/* File has extent covering the new size (could happen when extending +* inside a block)? +*/ +if (within_final_block) { +/* Extending file within the last file block */ + err =udf_do_extend_final_block (inode, &epos, &extent, + partial_final_block); + }else { + loff_t add = (offset << sb->s_blocksize_bits) |
Typed 'offset' to loff_t before shifting. Otherwise the shift could overflow for systems with 32-bit sector_t.
Quoted 7 lines
fs/udf/inode.c +4
-0+ partial_final_block; + err =udf_do_extend_file (inode, &epos, &extent, add); + } +if (err <0 ) goto out; err =0 ;
...
fs/udf/inode.c static sector_t inode_getblk(struct inod · line 809
Quoted 6 lines
fs/udf/inode.c +1
-1@@ -760,7 +806,8 @@ static sector_t inode_getblk(struct inod startnum = (offset >0 ); }/* Create extents for the hole between EOF and offset */ - ret =udf_do_extend_file (inode, &prev_epos, laarr, offset); + hole_len = offset << inode->i_sb->s_blocksize_bits;
The same as above.
fs/udf/inode.c static sector_t inode_getblk(struct inod · line 813
Quoted 4 lines
fs/udf/inode.c +1
-0+ ret =udf_do_extend_file (inode, &prev_epos, laarr, hole_len);if (ret <0 ) { *err = ret; newblock =0 ;
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR