Commit 0f1d344f authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe

splice: don't generate zero-len segement bvecs

iter_file_splice_write() may spawn bvec segments with zero-length. In
preparation for prohibiting them, filter out by hand at splice level.
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 684da762
...@@ -662,12 +662,14 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out, ...@@ -662,12 +662,14 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
/* build the vector */ /* build the vector */
left = sd.total_len; left = sd.total_len;
for (n = 0; !pipe_empty(head, tail) && left && n < nbufs; tail++, n++) { for (n = 0; !pipe_empty(head, tail) && left && n < nbufs; tail++) {
struct pipe_buffer *buf = &pipe->bufs[tail & mask]; struct pipe_buffer *buf = &pipe->bufs[tail & mask];
size_t this_len = buf->len; size_t this_len = buf->len;
if (this_len > left) /* zero-length bvecs are not supported, skip them */
this_len = left; if (!this_len)
continue;
this_len = min(this_len, left);
ret = pipe_buf_confirm(pipe, buf); ret = pipe_buf_confirm(pipe, buf);
if (unlikely(ret)) { if (unlikely(ret)) {
...@@ -680,6 +682,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out, ...@@ -680,6 +682,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
array[n].bv_len = this_len; array[n].bv_len = this_len;
array[n].bv_offset = buf->offset; array[n].bv_offset = buf->offset;
left -= this_len; left -= this_len;
n++;
} }
iov_iter_bvec(&from, WRITE, array, n, sd.total_len - left); iov_iter_bvec(&from, WRITE, array, n, sd.total_len - left);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment