splice: fix unexpected size truncation
authorXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Tue, 28 Jan 2014 01:07:12 +0000 (17:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jan 2014 05:02:40 +0000 (21:02 -0800)
@splice_desc.total_len is 32 bit(unsigned int) which is used to store the
size passed from userspace which is 64 bit(size_t) so that the size is
unexpectedly truncated

That means vmsplice can not work if the size passed from userspace is >=
4G, for example, we noticed in vmsplice, splice-reader does not do
anything and splice-writer is waiting for available buffer forever if the
size is 4G

Fix it by extending @splice_desc.total_len to 64 bits as well

Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/splice.h

index 74575cbf2d6f579c317fec5f1f16e9d3793fab03..0e43906d2fda6dc68cffc6343594178465d6e461 100644 (file)
@@ -24,7 +24,8 @@
  * Passed to the actors
  */
 struct splice_desc {
-       unsigned int len, total_len;    /* current and remaining length */
+       size_t total_len;               /* remaining length */
+       unsigned int len;               /* current length */
        unsigned int flags;             /* splice flags */
        /*
         * actor() private data