diff options
| author | Jan Kara <jack@suse.cz> | 2014-12-18 17:26:10 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2014-12-19 11:29:24 +0100 |
| commit | 4e2024624e678f0ebb916e6192bd23c1f9fdf696 (patch) | |
| tree | 0dcfd88ac8290d56563d4a9feb973e6eb83534e4 /fs/isofs/rock.c | |
| parent | 44e8967d591686463e84a88b46b03beba3ab49fb (diff) | |
isofs: Fix unchecked printing of ER records
We didn't check length of rock ridge ER records before printing them.
Thus corrupted isofs image can cause us to access and print some memory
behind the buffer with obvious consequences.
Reported-and-tested-by: Carl Henrik Lunde <chlunde@ping.uio.no>
CC: stable@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/isofs/rock.c')
| -rw-r--r-- | fs/isofs/rock.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c index bb63254ed84..735d7522a3a 100644 --- a/fs/isofs/rock.c +++ b/fs/isofs/rock.c @@ -362,6 +362,9 @@ repeat: rs.cont_size = isonum_733(rr->u.CE.size); break; case SIG('E', 'R'): + /* Invalid length of ER tag id? */ + if (rr->u.ER.len_id + offsetof(struct rock_ridge, u.ER.data) > rr->len) + goto out; ISOFS_SB(inode->i_sb)->s_rock = 1; printk(KERN_DEBUG "ISO 9660 Extensions: "); { |