summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Inyukhin <shurick@sectorb.msk.ru>2015-09-26 15:24:21 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-22 14:49:30 -0700
commite542cd0ad273af24f0a220c09b47523e681dc0e7 (patch)
tree645eaf93d0faa9fbd6648d2461233d38e1bac185
parent8c5a69e5fb303916738cd5f3a26ec97f478154fb (diff)
downloadlwn-e542cd0ad273af24f0a220c09b47523e681dc0e7.tar.gz
lwn-e542cd0ad273af24f0a220c09b47523e681dc0e7.zip
USB: chaoskey read offset bug
commit 1d5c47f555c5ae050fad22e4a99f88856cae5d05 upstream. Rng reads in chaoskey driver could return the same data under the certain conditions. Signed-off-by: Alexander Inyukhin <shurick@sectorb.msk.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/misc/chaoskey.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/chaoskey.c b/drivers/usb/misc/chaoskey.c
index 3ad5d19e4d04..23c794813e6a 100644
--- a/drivers/usb/misc/chaoskey.c
+++ b/drivers/usb/misc/chaoskey.c
@@ -472,7 +472,7 @@ static int chaoskey_rng_read(struct hwrng *rng, void *data,
if (this_time > max)
this_time = max;
- memcpy(data, dev->buf, this_time);
+ memcpy(data, dev->buf + dev->used, this_time);
dev->used += this_time;