summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2012-09-24 17:20:52 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-07 08:32:24 -0700
commitb5697de62b79060f59a5d7780aa4c16fdcfaa929 (patch)
tree722c7f11ac858994bdd241b1f08f9761239e669d
parent28675586f391fc14960de13c63359b25542ddec4 (diff)
downloadlinux-3.10-b5697de62b79060f59a5d7780aa4c16fdcfaa929.tar.gz
linux-3.10-b5697de62b79060f59a5d7780aa4c16fdcfaa929.tar.bz2
linux-3.10-b5697de62b79060f59a5d7780aa4c16fdcfaa929.zip
staging: comedi: s626: don't dereference insn->data
commit b655c2c4782ed3e2e71d2608154e295a3e860311 upstream. `s626_enc_insn_config()` is incorrectly dereferencing `insn->data` which is a pointer to user memory. It should be dereferencing the separate `data` parameter that points to a copy of the data in kernel memory. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/s626.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 23fc64b9988..c72128f30f1 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2370,7 +2370,7 @@ static int s626_enc_insn_config(struct comedi_device *dev,
/* (data==NULL) ? (Preloadvalue=0) : (Preloadvalue=data[0]); */
k->SetMode(dev, k, Setup, TRUE);
- Preload(dev, k, *(insn->data));
+ Preload(dev, k, data[0]);
k->PulseIndex(dev, k);
SetLatchSource(dev, k, valueSrclatch);
k->SetEnable(dev, k, (uint16_t) (enab != 0));