This is a note to let you know that I've just added the patch titled staging: comedi: adv_pci1710: Fix endian problem for AI command data 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-adv_pci1710-fix-endian-problem-for-ai-command-data.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 b2e78630f733a76508b53ba680528ca39c890e82 Mon Sep 17 00:00:00 2001 From: Ian Abbott <abbotti@xxxxxxxxx> Date: Tue, 23 Feb 2021 14:30:44 +0000 Subject: staging: comedi: adv_pci1710: Fix endian problem for AI command data From: Ian Abbott <abbotti@xxxxxxxxx> commit b2e78630f733a76508b53ba680528ca39c890e82 upstream. The analog input subdevice supports Comedi asynchronous commands that use Comedi's 16-bit sample format. However, the calls to `comedi_buf_write_samples()` are passing the address of a 32-bit integer variable. On bigendian machines, this will copy 2 bytes from the wrong end of the 32-bit value. Fix it by changing the type of the variables holding the sample value to `unsigned short`. The type of the `val` parameter of `pci1710_ai_read_sample()` is changed to `unsigned short *` accordingly. The type of the `val` variable in `pci1710_ai_insn_read()` is also changed to `unsigned short` since its address is passed to `pci1710_ai_read_sample()`. Fixes: a9c3a015c12f ("staging: comedi: adv_pci1710: use comedi_buf_write_samples()") Cc: <stable@xxxxxxxxxxxxxxx> # 4.0+ Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx> Link: https://lore.kernel.org/r/20210223143055.257402-4-abbotti@xxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/staging/comedi/drivers/adv_pci1710.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/drivers/staging/comedi/drivers/adv_pci1710.c @@ -300,11 +300,11 @@ static int pci1710_ai_eoc(struct comedi_ static int pci1710_ai_read_sample(struct comedi_device *dev, struct comedi_subdevice *s, unsigned int cur_chan, - unsigned int *val) + unsigned short *val) { const struct boardtype *board = dev->board_ptr; struct pci1710_private *devpriv = dev->private; - unsigned int sample; + unsigned short sample; unsigned int chan; sample = inw(dev->iobase + PCI171X_AD_DATA_REG); @@ -345,7 +345,7 @@ static int pci1710_ai_insn_read(struct c pci1710_ai_setup_chanlist(dev, s, &insn->chanspec, 1, 1); for (i = 0; i < insn->n; i++) { - unsigned int val; + unsigned short val; /* start conversion */ outw(0, dev->iobase + PCI171X_SOFTTRG_REG); @@ -395,7 +395,7 @@ static void pci1710_handle_every_sample( { struct comedi_cmd *cmd = &s->async->cmd; unsigned int status; - unsigned int val; + unsigned short val; int ret; status = inw(dev->iobase + PCI171X_STATUS_REG); @@ -455,7 +455,7 @@ static void pci1710_handle_fifo(struct c } for (i = 0; i < devpriv->max_samples; i++) { - unsigned int val; + unsigned short val; int ret; ret = pci1710_ai_read_sample(dev, s, s->async->cur_chan, &val); 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