Skip to content

Commit 573b07d

Browse files
Nikita Zhandarovichgregkh
authored andcommitted
comedi: check device's attached status in compat ioctls
commit 0de7d9c upstream. 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 8dc2f02 commit 573b07d

1 file changed

Lines changed: 36 additions & 6 deletions

File tree

drivers/comedi/comedi_fops.c

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

30253025
mutex_lock(&dev->mutex);
3026-
err = do_chaninfo_ioctl(dev, &chaninfo);
3026+
if (!dev->attached) {
3027+
dev_dbg(dev->class_dev, "no driver attached\n");
3028+
err = -ENODEV;
3029+
} else {
3030+
err = do_chaninfo_ioctl(dev, &chaninfo);
3031+
}
30273032
mutex_unlock(&dev->mutex);
30283033
return err;
30293034
}
@@ -3044,7 +3049,12 @@ static int compat_rangeinfo(struct file *file, unsigned long arg)
30443049
rangeinfo.range_ptr = compat_ptr(rangeinfo32.range_ptr);
30453050

30463051
mutex_lock(&dev->mutex);
3047-
err = do_rangeinfo_ioctl(dev, &rangeinfo);
3052+
if (!dev->attached) {
3053+
dev_dbg(dev->class_dev, "no driver attached\n");
3054+
err = -ENODEV;
3055+
} else {
3056+
err = do_rangeinfo_ioctl(dev, &rangeinfo);
3057+
}
30483058
mutex_unlock(&dev->mutex);
30493059
return err;
30503060
}
@@ -3120,7 +3130,12 @@ static int compat_cmd(struct file *file, unsigned long arg)
31203130
return rc;
31213131

31223132
mutex_lock(&dev->mutex);
3123-
rc = do_cmd_ioctl(dev, &cmd, &copy, file);
3133+
if (!dev->attached) {
3134+
dev_dbg(dev->class_dev, "no driver attached\n");
3135+
rc = -ENODEV;
3136+
} else {
3137+
rc = do_cmd_ioctl(dev, &cmd, &copy, file);
3138+
}
31243139
mutex_unlock(&dev->mutex);
31253140
if (copy) {
31263141
/* Special case: copy cmd back to user. */
@@ -3145,7 +3160,12 @@ static int compat_cmdtest(struct file *file, unsigned long arg)
31453160
return rc;
31463161

31473162
mutex_lock(&dev->mutex);
3148-
rc = do_cmdtest_ioctl(dev, &cmd, &copy, file);
3163+
if (!dev->attached) {
3164+
dev_dbg(dev->class_dev, "no driver attached\n");
3165+
rc = -ENODEV;
3166+
} else {
3167+
rc = do_cmdtest_ioctl(dev, &cmd, &copy, file);
3168+
}
31493169
mutex_unlock(&dev->mutex);
31503170
if (copy) {
31513171
err = put_compat_cmd(compat_ptr(arg), &cmd);
@@ -3205,7 +3225,12 @@ static int compat_insnlist(struct file *file, unsigned long arg)
32053225
}
32063226

32073227
mutex_lock(&dev->mutex);
3208-
rc = do_insnlist_ioctl(dev, insns, insnlist32.n_insns, file);
3228+
if (!dev->attached) {
3229+
dev_dbg(dev->class_dev, "no driver attached\n");
3230+
rc = -ENODEV;
3231+
} else {
3232+
rc = do_insnlist_ioctl(dev, insns, insnlist32.n_insns, file);
3233+
}
32093234
mutex_unlock(&dev->mutex);
32103235
kfree(insns);
32113236
return rc;
@@ -3224,7 +3249,12 @@ static int compat_insn(struct file *file, unsigned long arg)
32243249
return rc;
32253250

32263251
mutex_lock(&dev->mutex);
3227-
rc = do_insn_ioctl(dev, &insn, file);
3252+
if (!dev->attached) {
3253+
dev_dbg(dev->class_dev, "no driver attached\n");
3254+
rc = -ENODEV;
3255+
} else {
3256+
rc = do_insn_ioctl(dev, &insn, file);
3257+
}
32283258
mutex_unlock(&dev->mutex);
32293259
return rc;
32303260
}

0 commit comments

Comments
 (0)