Subject: + kfifo-kfifo_copy_tofrom_user-fix-copied-bytes-calculation.patch added to -mm tree
To: lars@xxxxxxxxxx,stefani@xxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 26 Sep 2013 14:41:21 -0700
The patch titled
Subject: kfifo: kfifo_copy_{to,from}_user: fix copied bytes calculation
has been added to the -mm tree. Its filename is
kfifo-kfifo_copy_tofrom_user-fix-copied-bytes-calculation.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/kfifo-kfifo_copy_tofrom_user-fix-copied-bytes-calculation.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/kfifo-kfifo_copy_tofrom_user-fix-copied-bytes-calculation.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Lars-Peter Clausen <lars@xxxxxxxxxx>
Subject: 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@xxxxxxxxxx>
Cc: Stefani Seibold <stefani@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/kfifo.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN lib/kfifo.c~kfifo-kfifo_copy_tofrom_user-fix-copied-bytes-calculation lib/kfifo.c
--- a/lib/kfifo.c~kfifo-kfifo_copy_tofrom_user-fix-copied-bytes-calculation
+++ a/lib/kfifo.c
@@ -215,7 +215,7 @@ static unsigned long kfifo_copy_from_use
* 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(
* 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;
}
_
Patches currently in -mm which might be from lars@xxxxxxxxxx are
kfifo-kfifo_copy_tofrom_user-fix-copied-bytes-calculation.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
