[PATCH 4.9 093/101] udf: Detect incorrect directory size

From: Greg Kroah-Hartman
Date: Sun Jul 01 2018 - 14:08:07 EST

4.9-stable review patch. If anyone has any objections, please let me know.


From: Jan Kara <jack@xxxxxxx>

commit fa65653e575fbd958bdf5fb9c4a71a324e39510d upstream.

Detect when a directory entry is (possibly partially) beyond directory
size and return EIO in that case since it means the filesystem is
corrupted. Otherwise directory operations can further corrupt the
directory and possibly also oops the kernel.

CC: Anatoly Trosinenko <anatoly.trosinenko@xxxxxxxxx>
CC: stable@xxxxxxxxxxxxxxx
Reported-and-tested-by: Anatoly Trosinenko <anatoly.trosinenko@xxxxxxxxx>
Signed-off-by: Jan Kara <jack@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

fs/udf/directory.c | 3 +++
1 file changed, 3 insertions(+)

--- a/fs/udf/directory.c
+++ b/fs/udf/directory.c
@@ -150,6 +150,9 @@ struct fileIdentDesc *udf_fileident_read
sizeof(struct fileIdentDesc));
+ /* Got last entry outside of dir size - fs is corrupted! */
+ if (*nf_pos > dir->i_size)
+ return NULL;
return fi;