diff options
| author | Alexander Inyukhin <shurick@sectorb.msk.ru> | 2015-09-26 15:24:21 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-22 14:43:23 -0700 |
| commit | 4c381d2d524c82bee6c25f277faa2f341c98dbd1 (patch) | |
| tree | a3bc7898edb4a7b3882fbf1f1e70fb21c95f5df8 /drivers/usb | |
| parent | 4cd1e73994526a6647e16b631ba76bbb4944660c (diff) | |
| download | linux-stable-4c381d2d524c82bee6c25f277faa2f341c98dbd1.tar.gz linux-stable-4c381d2d524c82bee6c25f277faa2f341c98dbd1.tar.bz2 linux-stable-4c381d2d524c82bee6c25f277faa2f341c98dbd1.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>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/misc/chaoskey.c | 2 |
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; |