This is a note to let you know that I've just added the patch titled
staging: comedi: pcl818: 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-pcl818-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 148e34fd33d53740642db523724226de14ee5281 Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@xxxxxxxxx>
Date: Tue, 23 Feb 2021 14:30:50 +0000
Subject: staging: comedi: pcl818: Fix endian problem for AI command data
From: Ian Abbott <abbotti@xxxxxxxxx>
commit 148e34fd33d53740642db523724226de14ee5281 upstream.
The analog input subdevice supports Comedi asynchronous commands that
use Comedi's 16-bit sample format. However, the call to
`comedi_buf_write_samples()` is passing the address of a 32-bit integer
parameter. 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 parameter
holding the sample value to `unsigned short`.
[Note: the bug was introduced in commit edf4537bcbf5 ("staging: comedi:
pcl818: use comedi_buf_write_samples()") but the patch applies better to
commit d615416de615 ("staging: comedi: pcl818: introduce
pcl818_ai_write_sample()").]
Fixes: d615416de615 ("staging: comedi: pcl818: introduce pcl818_ai_write_sample()")
Cc: <stable@xxxxxxxxxxxxxxx> # 4.0+
Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
Link: https://lore.kernel.org/r/20210223143055.257402-10-abbotti@xxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/comedi/drivers/pcl818.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/staging/comedi/drivers/pcl818.c
+++ b/drivers/staging/comedi/drivers/pcl818.c
@@ -423,7 +423,7 @@ static int pcl818_ai_eoc(struct comedi_d
static bool pcl818_ai_write_sample(struct comedi_device *dev,
struct comedi_subdevice *s,
- unsigned int chan, unsigned int val)
+ unsigned int chan, unsigned short val)
{
struct pcl818_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd;
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
