diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /fs/isofs/dir.c | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/isofs/dir.c')
| -rw-r--r-- | fs/isofs/dir.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c index 1ba407c64df1..2f0dc5a14633 100644 --- a/fs/isofs/dir.c +++ b/fs/isofs/dir.c | |||
| @@ -145,6 +145,14 @@ static int do_isofs_readdir(struct inode *inode, struct file *filp, | |||
| 145 | } | 145 | } |
| 146 | de = tmpde; | 146 | de = tmpde; |
| 147 | } | 147 | } |
| 148 | /* Basic sanity check, whether name doesn't exceed dir entry */ | ||
| 149 | if (de_len < de->name_len[0] + | ||
| 150 | sizeof(struct iso_directory_record)) { | ||
| 151 | printk(KERN_NOTICE "iso9660: Corrupted directory entry" | ||
| 152 | " in block %lu of inode %lu\n", block, | ||
| 153 | inode->i_ino); | ||
| 154 | return -EIO; | ||
| 155 | } | ||
| 148 | 156 | ||
| 149 | if (first_de) { | 157 | if (first_de) { |
| 150 | isofs_normalize_block_and_offset(de, | 158 | isofs_normalize_block_and_offset(de, |