Commit 80eb68d2 authored by Lepton Wu's avatar Lepton Wu Committed by Linus Torvalds
Browse files

reiserfs: fix kernel panic on corrupted directory

When reading corrupted reiserfs directory data, d_reclen could be a
negative number or a big positive number, this can lead to kernel panic or
oop.  The following patch adds a sanity check.
Signed-off-by: default avatarLepton Wu <>
Cc: Chris Mason <>
Cc: Jeff Mahoney <>
Cc: "Vladimir V. Saveliev" <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent a6cd6bf9
......@@ -121,6 +121,16 @@ static int reiserfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
d_reclen = entry_length(bh, ih, entry_num);
d_name = B_I_DEH_ENTRY_FILE_NAME(bh, ih, deh);
if (d_reclen <= 0 ||
d_name + d_reclen > bh->b_data + bh->b_size) {
/* There is corrupted data in entry,
* We'd better stop here */
ret = -EIO;
goto out;
if (!d_name[d_reclen - 1])
d_reclen = strlen(d_name);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment