Commit 8f3fafc9 authored Apr 26, 2018 by Scott Bauer Committed by Jens Axboe Aug 29, 2018

cdrom: Fix info leak/OOB read in cdrom_ioctl_drive_status



Like d88b6d04: "cdrom: information leak in cdrom_ioctl_media_changed()"

There is another cast from unsigned long to int which causes
a bounds check to fail with specially crafted input. The value is
then used as an index in the slot array in cdrom_slot_status().

Signed-off-by: Scott Bauer <scott.bauer@intel.com>
Signed-off-by: Scott Bauer <sbauer@plzdonthack.me>
Cc: stable@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent db193954

drivers/cdrom/cdrom.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2546,7 +2546,7 @@ static int cdrom_ioctl_drive_status(struct cdrom_device_info *cdi,
		if (!CDROM_CAN(CDC_SELECT_DISC) \|\|
		(arg == CDSL_CURRENT \|\| arg == CDSL_NONE))
		return cdi->ops->drive_status(cdi, CDSL_CURRENT);
		if (((int)arg >= cdi->capacity))
		if (arg >= cdi->capacity)
		return -EINVAL;
		return cdrom_slot_status(cdi, arg);
		}

Admin message