udf: Fix lost indirect extent block
authorJan Kara <jack@suse.cz>
Wed, 23 Dec 2015 17:05:03 +0000 (18:05 +0100)
committerJan Kara <jack@suse.cz>
Wed, 23 Dec 2015 17:05:03 +0000 (18:05 +0100)
When inode ends with empty indirect extent block and we extended that
file, udf_do_extend_file() ended up just overwriting pointer to it with
another extent and thus effectively leaking the block and also
corruptiong length of allocation descriptors.

Fix the problem by properly following into next indirect extent when it
is present.

Signed-off-by: Jan Kara <jack@suse.cz>
fs/udf/inode.c

index 34c2d2b..8462948 100644 (file)
@@ -539,9 +539,18 @@ static int udf_do_extend_file(struct inode *inode,
                udf_add_aext(inode, last_pos, &last_ext->extLocation,
                             last_ext->extLength, 1);
                count++;
-       } else
+       } else {
+               struct kernel_lb_addr tmploc;
+               uint32_t tmplen;
+
                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);
+       }
 
        /* Managed to do everything necessary? */
        if (!blocks)