[PATCH 25/46] comedi: mpc624: Add sanity checks for I/O base address

Ian Abbott posted 46 patches 1 week, 2 days ago
[PATCH 25/46] comedi: mpc624: Add sanity checks for I/O base address
Posted by Ian Abbott 1 week, 2 days ago
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>
---
 drivers/comedi/drivers/fl512.c  | 8 +++++++-
 drivers/comedi/drivers/mpc624.c | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/comedi/drivers/fl512.c b/drivers/comedi/drivers/fl512.c
index 139e801fc358..d9e6007556ac 100644
--- 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 9e51ff528ed1..e6343f4267c1 100644
--- 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;
 
-- 
2.51.0