Commit a3d4f596 authored Dec 18, 2014 by Jan Kara Committed by Greg Kroah-Hartman Jan 08, 2015

isofs: Fix unchecked printing of ER records



commit 4e202462 upstream.

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>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent e990e549

fs/isofs/rock.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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: ");
		{