diff options
| author |   Lars-Peter Clausen <lars@metafoo.de> | 2013-11-14 14:32:16 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 09:32:23 +0900 |
| commit | a019e48cfbfb358786326db3dbc1c565b8f14a56 (patch) | |
| tree | ecb17f9f9dde58a8da4b340129efabdece82dcc0 | |
| parent | sound/core/memalloc.c: use gen_pool_dma_alloc() to allocate iram buffer (diff) | |
| download | linux-dev-a019e48cfbfb358786326db3dbc1c565b8f14a56.tar.xz linux-dev-a019e48cfbfb358786326db3dbc1c565b8f14a56.zip | |
kfifo: kfifo_copy_{to,from}_user: fix copied bytes calculation
'copied' and 'len' are in bytes, while 'ret' is in elements, so we need to
multiply 'ret' with the size of one element to get the correct result.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: Stefani Seibold <stefani@seibold.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | lib/kfifo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kfifo.c b/lib/kfifo.c index 7b7f83027b7b..d79b9d222065 100644 --- a/lib/kfifo.c +++ b/lib/kfifo.c @@ -215,7 +215,7 @@ static unsigned long kfifo_copy_from_user(struct __kfifo *fifo, * incrementing the fifo->in index counter */ smp_wmb(); - *copied = len - ret; + *copied = len - ret * esize; /* return the number of elements which are not copied */ return ret; } @@ -275,7 +275,7 @@ static unsigned long kfifo_copy_to_user(struct __kfifo *fifo, void __user *to, * incrementing the fifo->out index counter */ smp_wmb(); - *copied = len - ret; + *copied = len - ret * esize; /* return the number of elements which are not copied */ return ret; } |