diff options
| author | Eric Sesterhenn <snakebyte@gmx.de> | 2008-10-18 20:28:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 08:52:38 -0700 |
| commit | 248736c2a57206388c86f8cdd3392ee986e84f9f (patch) | |
| tree | 1097d53f082e6773d7ecaac2eea5f7825c62cb01 | |
| parent | 6e7152944426be786c6c232990914e4565290d35 (diff) | |
| download | op-kernel-dev-248736c2a57206388c86f8cdd3392ee986e84f9f.zip op-kernel-dev-248736c2a57206388c86f8cdd3392ee986e84f9f.tar.gz | |
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: Eric Sesterhenn <snakebyte@gmx.de>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/hfsplus/extents.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/hfsplus/extents.c b/fs/hfsplus/extents.c index fec8f61..0022eec 100644 --- a/fs/hfsplus/extents.c +++ b/fs/hfsplus/extents.c @@ -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) { |
