* [PATCH 6.1.y] comedi: addi_apci_3xxx: fix subdevice count underallocation
@ 2026-11-16 14:26 Ian Abbott
2026-11-17 1:02 ` Sasha Levin
0 siblings, 1 reply; 2+ messages in thread
From: Ian Abbott @ 2026-11-16 14:26 UTC (permalink / raw)
To: stable; +Cc: Yang Zi, Ian Abbott, Greg Kroah-Hartman
From: Yang Zi <2959243019@qq.com>
[ Upstream commit 3de5aa458dede472a253266d02902bd95af8e849 ]
In apci3xxx_auto_attach(), the number of subdevices is computed with
n_subdevices = (board->ai_n_chan ? 0 : 1) + board->has_ao + ...
The ternary is inverted: when the board has analog input channels
(ai_n_chan != 0), it counts 0 instead of 1, so the AI subdevice that is
actually created is not accounted for. As a result
comedi_alloc_subdevices() allocates one entry too few, and the later
subdevice initialization (notably the TTL Digital I/O subdevice, which
is populated last) writes past the end of the allocated array, causing a
slab out-of-bounds write.
Flip the ternary to count 1 when ai_n_chan is non-zero and 0 otherwise,
matching the subdevice creation order in the function.
Signed-off-by: Yang Zi <2959243019@qq.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Link: https://patch.msgid.link/20261014101803.11036-1-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Fixes: 656e39fedcf0 ("staging: comedi: addi_apci_3xxx: only allocate needed subdevices")
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
drivers/comedi/drivers/addi_apci_3xxx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/comedi/drivers/addi_apci_3xxx.c b/drivers/comedi/drivers/addi_apci_3xxx.c
index bc72273e6a29..7355ec454cb4 100644
--- a/drivers/comedi/drivers/addi_apci_3xxx.c
+++ b/drivers/comedi/drivers/addi_apci_3xxx.c
@@ -787,7 +787,7 @@ static int apci3xxx_auto_attach(struct comedi_device *dev,
dev->irq = pcidev->irq;
}
- n_subdevices = (board->ai_n_chan ? 0 : 1) + board->has_ao +
+ n_subdevices = (board->ai_n_chan ? 1 : 0) + board->has_ao +
board->has_dig_in + board->has_dig_out +
board->has_ttl_io;
ret = comedi_alloc_subdevices(dev, n_subdevices);
--
2.53.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 6.1.y] comedi: addi_apci_3xxx: fix subdevice count underallocation
2026-11-16 14:26 [PATCH 6.1.y] comedi: addi_apci_3xxx: fix subdevice count underallocation Ian Abbott
@ 2026-11-17 1:02 ` Sasha Levin
0 siblings, 0 replies; 2+ messages in thread
From: Sasha Levin @ 2026-11-17 1:02 UTC (permalink / raw)
To: stable; +Cc: Sasha Levin, Yang Zi, Ian Abbott, Greg Kroah-Hartman
> The ternary is inverted: when the board has analog input channels
> (ai_n_chan != 0), it counts 0 instead of 1, so the AI subdevice that is
> actually created is not accounted for.
Queued for 7.3, 6.18, 6.12, 6.6, 6.1, 5.15 and 5.10, thanks.
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-17 1:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-16 14:26 [PATCH 6.1.y] comedi: addi_apci_3xxx: fix subdevice count underallocation Ian Abbott
2026-11-17 1:02 ` Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox