diff options
Diffstat (limited to 'fs/hpfs/map.c')
| -rw-r--r-- | fs/hpfs/map.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/fs/hpfs/map.c b/fs/hpfs/map.c index 0fecdac22e4e..c4724589b2eb 100644 --- a/fs/hpfs/map.c +++ b/fs/hpfs/map.c | |||
| @@ -126,32 +126,40 @@ struct fnode *hpfs_map_fnode(struct super_block *s, ino_t ino, struct buffer_hea | |||
| 126 | struct extended_attribute *ea; | 126 | struct extended_attribute *ea; |
| 127 | struct extended_attribute *ea_end; | 127 | struct extended_attribute *ea_end; |
| 128 | if (fnode->magic != FNODE_MAGIC) { | 128 | if (fnode->magic != FNODE_MAGIC) { |
| 129 | hpfs_error(s, "bad magic on fnode %08x", ino); | 129 | hpfs_error(s, "bad magic on fnode %08lx", |
| 130 | (unsigned long)ino); | ||
| 130 | goto bail; | 131 | goto bail; |
| 131 | } | 132 | } |
| 132 | if (!fnode->dirflag) { | 133 | if (!fnode->dirflag) { |
| 133 | if ((unsigned)fnode->btree.n_used_nodes + (unsigned)fnode->btree.n_free_nodes != | 134 | if ((unsigned)fnode->btree.n_used_nodes + (unsigned)fnode->btree.n_free_nodes != |
| 134 | (fnode->btree.internal ? 12 : 8)) { | 135 | (fnode->btree.internal ? 12 : 8)) { |
| 135 | hpfs_error(s, "bad number of nodes in fnode %08x", ino); | 136 | hpfs_error(s, |
| 137 | "bad number of nodes in fnode %08lx", | ||
| 138 | (unsigned long)ino); | ||
| 136 | goto bail; | 139 | goto bail; |
| 137 | } | 140 | } |
| 138 | if (fnode->btree.first_free != | 141 | if (fnode->btree.first_free != |
| 139 | 8 + fnode->btree.n_used_nodes * (fnode->btree.internal ? 8 : 12)) { | 142 | 8 + fnode->btree.n_used_nodes * (fnode->btree.internal ? 8 : 12)) { |
| 140 | hpfs_error(s, "bad first_free pointer in fnode %08x", ino); | 143 | hpfs_error(s, |
| 144 | "bad first_free pointer in fnode %08lx", | ||
| 145 | (unsigned long)ino); | ||
| 141 | goto bail; | 146 | goto bail; |
| 142 | } | 147 | } |
| 143 | } | 148 | } |
| 144 | if (fnode->ea_size_s && ((signed int)fnode->ea_offs < 0xc4 || | 149 | if (fnode->ea_size_s && ((signed int)fnode->ea_offs < 0xc4 || |
| 145 | (signed int)fnode->ea_offs + fnode->acl_size_s + fnode->ea_size_s > 0x200)) { | 150 | (signed int)fnode->ea_offs + fnode->acl_size_s + fnode->ea_size_s > 0x200)) { |
| 146 | hpfs_error(s, "bad EA info in fnode %08x: ea_offs == %04x ea_size_s == %04x", | 151 | hpfs_error(s, |
| 147 | ino, fnode->ea_offs, fnode->ea_size_s); | 152 | "bad EA info in fnode %08lx: ea_offs == %04x ea_size_s == %04x", |
| 153 | (unsigned long)ino, | ||
| 154 | fnode->ea_offs, fnode->ea_size_s); | ||
| 148 | goto bail; | 155 | goto bail; |
| 149 | } | 156 | } |
| 150 | ea = fnode_ea(fnode); | 157 | ea = fnode_ea(fnode); |
| 151 | ea_end = fnode_end_ea(fnode); | 158 | ea_end = fnode_end_ea(fnode); |
| 152 | while (ea != ea_end) { | 159 | while (ea != ea_end) { |
| 153 | if (ea > ea_end) { | 160 | if (ea > ea_end) { |
| 154 | hpfs_error(s, "bad EA in fnode %08x", ino); | 161 | hpfs_error(s, "bad EA in fnode %08lx", |
| 162 | (unsigned long)ino); | ||
| 155 | goto bail; | 163 | goto bail; |
| 156 | } | 164 | } |
| 157 | ea = next_ea(ea); | 165 | ea = next_ea(ea); |