Skip to content

Commit 0de7d9c

Browse files
Nikita Zhandarovichgregkh
authored andcommitted
comedi: check device's attached status in compat ioctls
Syzbot identified an issue [1] that crashes kernel, seemingly due to unexistent callback dev->get_valid_routes(). By all means, this should not occur as said callback must always be set to get_zero_valid_routes() in __comedi_device_postconfig(). As the crash seems to appear exclusively in i386 kernels, at least, judging from [1] reports, the blame lies with compat versions of standard IOCTL handlers. Several of them are modified and do not use comedi_unlocked_ioctl(). While functionality of these ioctls essentially copy their original versions, they do not have required sanity check for device's attached status. This, in turn, leads to a possibility of calling select IOCTLs on a device that has not been properly setup, even via COMEDI_DEVCONFIG. Doing so on unconfigured devices means that several crucial steps are missed, for instance, specifying dev->get_valid_routes() callback. Fix this somewhat crudely by ensuring device's attached status before performing any ioctls, improving logic consistency between modern and compat functions. [1] Syzbot report: BUG: kernel NULL pointer dereference, address: 0000000000000000 ... CR2: ffffffffffffffd6 CR3: 000000006c717000 CR4: 0000000000352ef0 Call Trace: <TASK> get_valid_routes drivers/comedi/comedi_fops.c:1322 [inline] parse_insn+0x78c/0x1970 drivers/comedi/comedi_fops.c:1401 do_insnlist_ioctl+0x272/0x700 drivers/comedi/comedi_fops.c:1594 compat_insnlist drivers/comedi/comedi_fops.c:3208 [inline] comedi_compat_ioctl+0x810/0x990 drivers/comedi/comedi_fops.c:3273 __do_compat_sys_ioctl fs/ioctl.c:695 [inline] __se_compat_sys_ioctl fs/ioctl.c:638 [inline] __ia32_compat_sys_ioctl+0x242/0x370 fs/ioctl.c:638 do_syscall_32_irqs_on arch/x86/entry/syscall_32.c:83 [inline] ... Reported-by: syzbot+ab8008c24e84adee93ff@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=ab8008c24e84adee93ff Fixes: 3fbfd22 ("comedi: get rid of compat_alloc_user_space() mess in COMEDI_CHANINFO compat") Cc: stable <stable@kernel.org> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Nikita Zhandarovich <n.zhandarovich@fintech.ru> Link: https://patch.msgid.link/20251023132234.395794-1-n.zhandarovich@fintech.ru Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 7226233 commit 0de7d9c

File tree

1 file changed

+36
-6
lines changed

1 file changed

+36
-6
lines changed

drivers/comedi/comedi_fops.c

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3018,7 +3018,12 @@ static int compat_chaninfo(struct file *file, unsigned long arg)
30183018
chaninfo.rangelist = compat_ptr(chaninfo32.rangelist);
30193019

30203020
mutex_lock(&dev->mutex);
3021-
err = do_chaninfo_ioctl(dev, &chaninfo);
3021+
if (!dev->attached) {
3022+
dev_dbg(dev->class_dev, "no driver attached\n");
3023+
err = -ENODEV;
3024+
} else {
3025+
err = do_chaninfo_ioctl(dev, &chaninfo);
3026+
}
30223027
mutex_unlock(&dev->mutex);
30233028
return err;
30243029
}
@@ -3039,7 +3044,12 @@ static int compat_rangeinfo(struct file *file, unsigned long arg)
30393044
rangeinfo.range_ptr = compat_ptr(rangeinfo32.range_ptr);
30403045

30413046
mutex_lock(&dev->mutex);
3042-
err = do_rangeinfo_ioctl(dev, &rangeinfo);
3047+
if (!dev->attached) {
3048+
dev_dbg(dev->class_dev, "no driver attached\n");
3049+
err = -ENODEV;
3050+
} else {
3051+
err = do_rangeinfo_ioctl(dev, &rangeinfo);
3052+
}
30433053
mutex_unlock(&dev->mutex);
30443054
return err;
30453055
}
@@ -3115,7 +3125,12 @@ static int compat_cmd(struct file *file, unsigned long arg)
31153125
return rc;
31163126

31173127
mutex_lock(&dev->mutex);
3118-
rc = do_cmd_ioctl(dev, &cmd, &copy, file);
3128+
if (!dev->attached) {
3129+
dev_dbg(dev->class_dev, "no driver attached\n");
3130+
rc = -ENODEV;
3131+
} else {
3132+
rc = do_cmd_ioctl(dev, &cmd, &copy, file);
3133+
}
31193134
mutex_unlock(&dev->mutex);
31203135
if (copy) {
31213136
/* Special case: copy cmd back to user. */
@@ -3140,7 +3155,12 @@ static int compat_cmdtest(struct file *file, unsigned long arg)
31403155
return rc;
31413156

31423157
mutex_lock(&dev->mutex);
3143-
rc = do_cmdtest_ioctl(dev, &cmd, &copy, file);
3158+
if (!dev->attached) {
3159+
dev_dbg(dev->class_dev, "no driver attached\n");
3160+
rc = -ENODEV;
3161+
} else {
3162+
rc = do_cmdtest_ioctl(dev, &cmd, &copy, file);
3163+
}
31443164
mutex_unlock(&dev->mutex);
31453165
if (copy) {
31463166
err = put_compat_cmd(compat_ptr(arg), &cmd);
@@ -3200,7 +3220,12 @@ static int compat_insnlist(struct file *file, unsigned long arg)
32003220
}
32013221

32023222
mutex_lock(&dev->mutex);
3203-
rc = do_insnlist_ioctl(dev, insns, insnlist32.n_insns, file);
3223+
if (!dev->attached) {
3224+
dev_dbg(dev->class_dev, "no driver attached\n");
3225+
rc = -ENODEV;
3226+
} else {
3227+
rc = do_insnlist_ioctl(dev, insns, insnlist32.n_insns, file);
3228+
}
32043229
mutex_unlock(&dev->mutex);
32053230
kfree(insns);
32063231
return rc;
@@ -3219,7 +3244,12 @@ static int compat_insn(struct file *file, unsigned long arg)
32193244
return rc;
32203245

32213246
mutex_lock(&dev->mutex);
3222-
rc = do_insn_ioctl(dev, &insn, file);
3247+
if (!dev->attached) {
3248+
dev_dbg(dev->class_dev, "no driver attached\n");
3249+
rc = -ENODEV;
3250+
} else {
3251+
rc = do_insn_ioctl(dev, &insn, file);
3252+
}
32233253
mutex_unlock(&dev->mutex);
32243254
return rc;
32253255
}

0 commit comments

Comments
 (0)