Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 248736c2 authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Linus Torvalds
Browse files

hfsplus: fix possible deadlock when handling corrupted extents 



A corrupted extent for the extent file itself may try to get an impossible
extent, causing a deadlock if I see it correctly.

Check the inode number after the first_blocks checks and fail if it's the
extent file, as according to the spec the extent file should have no
extent for itself.

Signed-off-by: default avatarEric Sesterhenn <snakebyte@gmx.de>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6e715294

fs/hfsplus/extents.c

+3 −0
Original line number Diff line number Diff line
@@ -199,6 +199,9 @@ int hfsplus_get_block(struct inode *inode, sector_t iblock, 
		goto done;

	}



	if (inode->i_ino == HFSPLUS_EXT_CNID)

		return -EIO;



	mutex_lock(&HFSPLUS_I(inode).extents_lock);

	res = hfsplus_ext_read_extent(inode, ablock);

	if (!res) {