diff options
| author | Lepton Wu <ytht.net@gmail.com> | 2007-10-16 23:29:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 08:42:57 -0700 |
| commit | 80eb68d23897126e7f25e2b3689bc27fb8cdde17 (patch) | |
| tree | f054c849b1e8856912050342fcb27d83a6f42830 | |
| parent | a6cd6bf9f8cab154a4a086fe786bd7422954d8dc (diff) | |
| download | op-kernel-dev-80eb68d23897126e7f25e2b3689bc27fb8cdde17.zip op-kernel-dev-80eb68d23897126e7f25e2b3689bc27fb8cdde17.tar.gz | |
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: Lepton Wu <ytht.net@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Jeff Mahoney <jeffm@suse.com>
Cc: "Vladimir V. Saveliev" <vs@namesys.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/reiserfs/dir.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c index ffbfc2c..e6b03d2 100644 --- a/fs/reiserfs/dir.c +++ b/fs/reiserfs/dir.c @@ -121,6 +121,16 @@ static int reiserfs_readdir(struct file *filp, void *dirent, filldir_t filldir) continue; 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 */ + pathrelse(&path_to_entry); + ret = -EIO; + goto out; + } + if (!d_name[d_reclen - 1]) d_reclen = strlen(d_name); |
