Skip to content

Commit a1acdbc

Browse files
ian-abbottgregkh
authored andcommitted
staging: comedi: comedi_parport: Use 16-bit 0 for interrupt data
The comedi_parport driver has an "interrupt" subdevice that supports Comedi asynchronous commands, placing a value in the Comedi buffer for each interrupt. The subdevice uses Comedi's 16-bit sample format but the interrupt handler is calling `comedi_buf_write_samples()` with the address of a 32-bit integer `&s->state`. On bigendian machines, this will copy 2 bytes from the wrong end of the 32-bit integer. This isn't really a problem since `s->state` will always be 0 for this subdevice, but clean it up by using a 16-bit variable initialized to 0 to pass the value. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Link: https://lore.kernel.org/r/20210223143055.257402-12-abbotti@mev.co.uk Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 8536749 commit a1acdbc

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/staging/comedi/drivers/comedi_parport.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,13 @@ static irqreturn_t parport_interrupt(int irq, void *d)
210210
struct comedi_device *dev = d;
211211
struct comedi_subdevice *s = dev->read_subdev;
212212
unsigned int ctrl;
213+
unsigned short val = 0;
213214

214215
ctrl = inb(dev->iobase + PARPORT_CTRL_REG);
215216
if (!(ctrl & PARPORT_CTRL_IRQ_ENA))
216217
return IRQ_NONE;
217218

218-
comedi_buf_write_samples(s, &s->state, 1);
219+
comedi_buf_write_samples(s, &val, 1);
219220
comedi_handle_events(dev, s);
220221

221222
return IRQ_HANDLED;

0 commit comments

Comments
 (0)