This is a note to let you know that I've just added the patch titled staging: comedi: addi_apci_1032: Fix endian problem for COS sample to the 5.11-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: staging-comedi-addi_apci_1032-fix-endian-problem-for-cos-sample.patch and it can be found in the queue-5.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 25317f428a78fde71b2bf3f24d05850f08a73a52 Mon Sep 17 00:00:00 2001 From: Ian Abbott <abbotti@xxxxxxxxx> Date: Tue, 23 Feb 2021 14:30:42 +0000 Subject: staging: comedi: addi_apci_1032: Fix endian problem for COS sample From: Ian Abbott <abbotti@xxxxxxxxx> commit 25317f428a78fde71b2bf3f24d05850f08a73a52 upstream. The Change-Of-State (COS) subdevice supports Comedi asynchronous commands to read 16-bit change-of-state values. However, the interrupt handler is calling `comedi_buf_write_samples()` with the address of a 32-bit integer `&s->state`. On bigendian architectures, it will copy 2 bytes from the wrong end of the 32-bit integer. Fix it by transferring the value via a 16-bit integer. Fixes: 6bb45f2b0c86 ("staging: comedi: addi_apci_1032: use comedi_buf_write_samples()") Cc: <stable@xxxxxxxxxxxxxxx> # 3.19+ Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx> Link: https://lore.kernel.org/r/20210223143055.257402-2-abbotti@xxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/staging/comedi/drivers/addi_apci_1032.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/staging/comedi/drivers/addi_apci_1032.c +++ b/drivers/staging/comedi/drivers/addi_apci_1032.c @@ -260,6 +260,7 @@ static irqreturn_t apci1032_interrupt(in struct apci1032_private *devpriv = dev->private; struct comedi_subdevice *s = dev->read_subdev; unsigned int ctrl; + unsigned short val; /* check interrupt is from this device */ if ((inl(devpriv->amcc_iobase + AMCC_OP_REG_INTCSR) & @@ -275,7 +276,8 @@ static irqreturn_t apci1032_interrupt(in outl(ctrl & ~APCI1032_CTRL_INT_ENA, dev->iobase + APCI1032_CTRL_REG); s->state = inl(dev->iobase + APCI1032_STATUS_REG) & 0xffff; - comedi_buf_write_samples(s, &s->state, 1); + val = s->state; + comedi_buf_write_samples(s, &val, 1); comedi_handle_events(dev, s); /* enable the interrupt */ Patches currently in stable-queue which might be from abbotti@xxxxxxxxx are queue-5.11/staging-comedi-addi_apci_1500-fix-endian-problem-for-command-sample.patch queue-5.11/staging-comedi-das800-fix-endian-problem-for-ai-command-data.patch queue-5.11/staging-comedi-pcl818-fix-endian-problem-for-ai-command-data.patch queue-5.11/staging-comedi-dmm32at-fix-endian-problem-for-ai-command-data.patch queue-5.11/staging-comedi-pcl711-fix-endian-problem-for-ai-command-data.patch queue-5.11/staging-comedi-das6402-fix-endian-problem-for-ai-command-data.patch queue-5.11/staging-comedi-me4000-fix-endian-problem-for-ai-command-data.patch queue-5.11/staging-comedi-addi_apci_1032-fix-endian-problem-for-cos-sample.patch queue-5.11/staging-comedi-adv_pci1710-fix-endian-problem-for-ai-command-data.patch