Skip to content

Commit dc0a2f1

Browse files
ian-abbottgregkh
authored andcommitted
comedi: Make insn_rw_emulate_bits() do insn->n samples
commit 7afba92 upstream. The `insn_rw_emulate_bits()` function is used as a default handler for `INSN_READ` instructions for subdevices that have a handler for `INSN_BITS` but not for `INSN_READ`. Similarly, it is used as a default handler for `INSN_WRITE` instructions for subdevices that have a handler for `INSN_BITS` but not for `INSN_WRITE`. It works by emulating the `INSN_READ` or `INSN_WRITE` instruction handling with a constructed `INSN_BITS` instruction. However, `INSN_READ` and `INSN_WRITE` instructions are supposed to be able read or write multiple samples, indicated by the `insn->n` value, but `insn_rw_emulate_bits()` currently only handles a single sample. For `INSN_READ`, the comedi core will copy `insn->n` samples back to user-space. (That triggered KASAN kernel-infoleak errors when `insn->n` was greater than 1, but that is being fixed more generally elsewhere in the comedi core.) Make `insn_rw_emulate_bits()` either handle `insn->n` samples, or return an error, to conform to the general expectation for `INSN_READ` and `INSN_WRITE` handlers. Fixes: ed9eccb ("Staging: add comedi core") Cc: stable <stable@kernel.org> # 5.13+ Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Link: https://lore.kernel.org/r/20250725141034.87297-1-abbotti@mev.co.uk Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5eb586c commit dc0a2f1

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

drivers/comedi/drivers.c

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -620,11 +620,9 @@ static int insn_rw_emulate_bits(struct comedi_device *dev,
620620
unsigned int chan = CR_CHAN(insn->chanspec);
621621
unsigned int base_chan = (chan < 32) ? 0 : chan;
622622
unsigned int _data[2];
623+
unsigned int i;
623624
int ret;
624625

625-
if (insn->n == 0)
626-
return 0;
627-
628626
memset(_data, 0, sizeof(_data));
629627
memset(&_insn, 0, sizeof(_insn));
630628
_insn.insn = INSN_BITS;
@@ -635,18 +633,21 @@ static int insn_rw_emulate_bits(struct comedi_device *dev,
635633
if (insn->insn == INSN_WRITE) {
636634
if (!(s->subdev_flags & SDF_WRITABLE))
637635
return -EINVAL;
638-
_data[0] = 1U << (chan - base_chan); /* mask */
639-
_data[1] = data[0] ? (1U << (chan - base_chan)) : 0; /* bits */
636+
_data[0] = 1U << (chan - base_chan); /* mask */
640637
}
638+
for (i = 0; i < insn->n; i++) {
639+
if (insn->insn == INSN_WRITE)
640+
_data[1] = data[i] ? _data[0] : 0; /* bits */
641641

642-
ret = s->insn_bits(dev, s, &_insn, _data);
643-
if (ret < 0)
644-
return ret;
642+
ret = s->insn_bits(dev, s, &_insn, _data);
643+
if (ret < 0)
644+
return ret;
645645

646-
if (insn->insn == INSN_READ)
647-
data[0] = (_data[1] >> (chan - base_chan)) & 1;
646+
if (insn->insn == INSN_READ)
647+
data[i] = (_data[1] >> (chan - base_chan)) & 1;
648+
}
648649

649-
return 1;
650+
return insn->n;
650651
}
651652

652653
static int __comedi_device_postconfig_async(struct comedi_device *dev,

0 commit comments

Comments
 (0)