[PATCH 31/46] comedi: ni_labpc: Add sanity checks for I/O base address

Ian Abbott posted 46 patches 1 week, 3 days ago
[PATCH 31/46] comedi: ni_labpc: Add sanity checks for I/O base address
Posted by Ian Abbott 1 week, 3 days ago
The "ni_labpc" driver uses an admin-supplied configuration option
(`it->options[0]`) to configure the I/O port base address of a
Lab-PC-1200 series or Lab-PC+ board.  It currently allows any base
address to be configured but the hardware only supports base addresses
(configured by a configuration utility and stored in nonvolatile memory)
in the range 0 to 0x3E0 on 32-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/ni_labpc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/comedi/drivers/ni_labpc.c b/drivers/comedi/drivers/ni_labpc.c
index b25a8e117072..93b5333a99b5 100644
--- a/drivers/comedi/drivers/ni_labpc.c
+++ b/drivers/comedi/drivers/ni_labpc.c
@@ -78,7 +78,8 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	unsigned int dma_chan = it->options[2];
 	int ret;
 
-	ret = comedi_request_region(dev, it->options[0], 0x20);
+	ret = comedi_check_request_region(dev, it->options[0], 0x20,
+					  0, 0x3ff, 32);
 	if (ret)
 		return ret;
 
-- 
2.51.0