summaryrefslogtreecommitdiffstats
path: root/drivers/cdrom/cdrom.c
diff options
context:
space:
mode:
authorYoung_X <YangX92@hotmail.com>2018-10-03 14:54:29 +0200
committerJens Axboe <axboe@kernel.dk>2018-10-03 18:20:40 +0200
commite4f3aa2e1e67bb48dfbaaf1cad59013d5a5bc276 (patch)
treefe85b2c9966c3d9ec4721a2a73d308f7444d7db8 /drivers/cdrom/cdrom.c
parentpktcdvd: fix fall-through annotation (diff)
downloadlinux-e4f3aa2e1e67bb48dfbaaf1cad59013d5a5bc276.tar.xz
linux-e4f3aa2e1e67bb48dfbaaf1cad59013d5a5bc276.zip
cdrom: fix improper type cast, which can leat to information leak.
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(). This issue is similar to CVE-2018-16658 and CVE-2018-10940. Signed-off-by: Young_X <YangX92@hotmail.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/cdrom/cdrom.c')
-rw-r--r--drivers/cdrom/cdrom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index a5d5a96479bf..10802d1fc554 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2445,7 +2445,7 @@ static int cdrom_ioctl_select_disc(struct cdrom_device_info *cdi,
return -ENOSYS;
if (arg != CDSL_CURRENT && arg != CDSL_NONE) {
- if ((int)arg >= cdi->capacity)
+ if (arg >= cdi->capacity)
return -EINVAL;
}