Commit 791771e4 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: usbduxsigma: fix unaligned dereferences

There are a couple of dereferences such as `*(uint32_t
*)(devpriv->insn_buf + 1)` that are unaligned as `devpriv->insn_buf` is
of type `uint8_t *`.  This works on x86 architecture but may not be
supported on other architectures.  Call `get_unalign()` to perform the
unaligned dereferences.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Cc: Bernd Porr <mail@berndporr.me.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f1ffdfcc
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/fcntl.h> #include <linux/fcntl.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/unaligned.h>
#include "comedi_fc.h" #include "comedi_fc.h"
#include "../comedidev.h" #include "../comedidev.h"
...@@ -792,7 +793,8 @@ static int usbduxsigma_ai_insn_read(struct comedi_device *dev, ...@@ -792,7 +793,8 @@ static int usbduxsigma_ai_insn_read(struct comedi_device *dev,
} }
/* 32 bits big endian from the A/D converter */ /* 32 bits big endian from the A/D converter */
val = be32_to_cpu(*((uint32_t *)((devpriv->insn_buf) + 1))); val = be32_to_cpu(get_unaligned((uint32_t
*)(devpriv->insn_buf + 1)));
val &= 0x00ffffff; /* strip status byte */ val &= 0x00ffffff; /* strip status byte */
val ^= 0x00800000; /* convert to unsigned */ val ^= 0x00800000; /* convert to unsigned */
...@@ -1357,7 +1359,7 @@ static int usbduxsigma_getstatusinfo(struct comedi_device *dev, int chan) ...@@ -1357,7 +1359,7 @@ static int usbduxsigma_getstatusinfo(struct comedi_device *dev, int chan)
return ret; return ret;
/* 32 bits big endian from the A/D converter */ /* 32 bits big endian from the A/D converter */
val = be32_to_cpu(*((uint32_t *)((devpriv->insn_buf)+1))); val = be32_to_cpu(get_unaligned((uint32_t *)(devpriv->insn_buf + 1)));
val &= 0x00ffffff; /* strip status byte */ val &= 0x00ffffff; /* strip status byte */
val ^= 0x00800000; /* convert to unsigned */ val ^= 0x00800000; /* convert to unsigned */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment