comedi: mpc624: Add sanity checks for I/O base address

The "mpc624" driver uses an admin-supplied configuration option
(`it->options[0]`) to configure the I/O port base address of a MPC624
board.  It currently allows any base address to be configured but the
hardware only supports base addresses (configured by on-board jumpers)
in the range 0 to 0x3F0 on 16-byte boundaries.

Add a sanity check to ensure the device is not configured at an
unsupported base address.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Link: https://patch.msgid.link/20260130170416.49994-26-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/comedi/drivers/fl512.c b/drivers/comedi/drivers/fl512.c
index 139e801fc358be68deae4b9a952ccd720307605c..d9e6007556ac7e21f89f8dfe00ebb2d1573d8a1b 100644 (file)
--- a/drivers/comedi/drivers/fl512.c
+++ b/drivers/comedi/drivers/fl512.c
@@ -98,9 +98,15 @@ static int fl512_ao_insn_write(struct comedi_device *dev,
 static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
        struct comedi_subdevice *s;
+       unsigned int iobase = it->options[0];
        int ret;
 
-       ret = comedi_request_region(dev, it->options[0], 0x10);
+       /*
+        * FIXME: Don't know the allowed range, but assume it needs to be
+        * on a 16-byte boundary - Ian Abbott
+        */
+       ret = comedi_check_request_region(dev, iobase, 0x10,
+                                         0, UINT_MAX, 16);
        if (ret)
                return ret;
 

diff --git a/drivers/comedi/drivers/mpc624.c b/drivers/comedi/drivers/mpc624.c
index 9e51ff528ed158173c3d5cb83cb85c39c02fe656..e6343f4267c1bad42152352c901e8feea906481f 100644 (file)
--- a/drivers/comedi/drivers/mpc624.c
+++ b/drivers/comedi/drivers/mpc624.c
@@ -237,7 +237,8 @@ static int mpc624_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        struct comedi_subdevice *s;
        int ret;
 
-       ret = comedi_request_region(dev, it->options[0], 0x10);
+       ret = comedi_check_request_region(dev, it->options[0], 0x10,
+                                         0, 0x3ff, 16);
        if (ret)
                return ret;