From 6e6ad768663791c897ed6f7e968a619366279994 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Mon, 28 Jan 2013 16:14:31 +0000 Subject: [PATCH] --- yaml --- r: 354291 b: refs/heads/master c: 754ab5c0e55dd118273ca2c217c4d95e9fbc8259 h: refs/heads/master i: 354289: 0eb5d4218ca4a274704fff0e960dda10b2e6fc6a 354287: c20d41a4132b114daa1932694737350ac1423076 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ad1faa4eb96c..f4c484efabf7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 612588a886965706e9593626c277e561c1932249 +refs/heads/master: 754ab5c0e55dd118273ca2c217c4d95e9fbc8259 diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c index fa534fe4864b..38e4fcb418c0 100644 --- a/trunk/drivers/staging/comedi/comedi_fops.c +++ b/trunk/drivers/staging/comedi/comedi_fops.c @@ -1633,6 +1633,11 @@ static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd, /* Device config is special, because it must work on * an unconfigured device. */ if (cmd == COMEDI_DEVCONFIG) { + if (minor >= COMEDI_NUM_BOARD_MINORS) { + /* Device config not appropriate on non-board minors. */ + rc = -ENOTTY; + goto done; + } rc = do_devconfig_ioctl(dev, (struct comedi_devconfig __user *)arg); if (rc == 0)