staging: comedi: ni_at_a2150: range check board index
PATCH 1/1 staging: comedi: ni_at_a2150: range check board index
The "ni_at_a2150" driver determines the board type by calling a2150_probe(). This reads a register and converts it to a board index in the range 0 to 3. However, the board table array it indexes into (a2150_boards[]) only has 2 entries. Return an error from the Comedi driver "attach" handler a2150_attach() if the probed board index is beyond the end of the array.
--- drivers/staging/comedi/drivers/ni_at_a2150.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/staging/comedi/drivers/ni_at_a2150.c +5 -1
@@ -705,7 +705,11 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (ret)return ret; - dev->board_ptr = a2150_boards +a2150_probe (dev); + i =a2150_probe (dev); +if (i >=ARRAY_SIZE (a2150_boards)) +return -ENODEV ; + + dev->board_ptr = a2150_boards + i; thisboard =comedi_board (dev); dev->board_name = thisboard->name;
Signature · 1 line
2.0.4
Quoted 8 lines · Ian Abbott
The "
ni_at_a2150" driver determines the board type by callinga2150_probe(). This reads a register and converts it to a board index in the range 0 to 3. However, the board table array it indexes into (a2150_boards[]) only has 2 entries. Return an error from the Comedi driver "attach" handlera2150_attach()if the probed board index is beyond the end of the array.Signed-off-by Ian Abbott <[email protected]>