History

splice: don't merge into linked buffers

Before this patch, it was possible for two pipes to affect each other after data had been transferred between them with tee(): ============ $ cat tee_test.c int main(void) { int pipe_a[2]; if (pipe(pipe_a)) err(1, "pipe"); int pipe_b[2]; if (pipe(pipe_b)) err(1, "pipe"); if (write(pipe_a[1], "abcd", 4) != 4) err(1, "write"); if (tee(pipe_a[0], pipe_b[1], 2, 0) != 2) err(1, "tee"); if (write(pipe_b[1], "xx", 2) != 2) err(1, "write"); char buf[5]; if (read(pipe_a[0], buf, 4) != 4) err(1, "read"); buf[4] = 0; printf("got back: '%s'\n", buf); } $ gcc -o tee_test tee_test.c $ ./tee_test got back: 'abxx' $ ============ As suggested by Al Viro, fix it by creating a separate type for non-mergeable pipe buffers, then changing the types of buffers in splice_pipe_to_pipe() and link_pipe().

Jann Horn committed 7 years ago

Commit a0ce2f01 parent 801e5233 files · +19 −0Browse files

Unified · Split

3 files
  1. fs/pipe.c +14 −0
  2. fs/splice.c +4 −0
  3. include/linux/pipe_fs_i.h +1 −0
fs/pipe.c+14−0
@@ -234,6 +234,14 @@ static const struct pipe_buf_operations anon_pipe_buf_ops = { · 233 unmodified lines
234234 .get = generic_pipe_buf_get,
235235 };
236236
237+static const struct pipe_buf_operations anon_pipe_buf_nomerge_ops = {
238+ .can_merge = 0,
239+ .confirm = generic_pipe_buf_confirm,
240+ .release = anon_pipe_buf_release,
241+ .steal = anon_pipe_buf_steal,
242+ .get = generic_pipe_buf_get,
243+};
244+
237245 static const struct pipe_buf_operations packet_pipe_buf_ops = {
238246 .can_merge = 0,
239247 .confirm = generic_pipe_buf_confirm,
@@ -242,6 +250,12 @@ static const struct pipe_buf_operations packet_pipe_buf_ops = { · 2 unmodified lines
242250 .get = generic_pipe_buf_get,
243251 };
244252
253+void pipe_buf_mark_unmergeable(struct pipe_buffer *buf)
254+{
255+ if (buf->ops == &anon_pipe_buf_ops)
256+ buf->ops = &anon_pipe_buf_nomerge_ops;
257+}
258+
245259 static ssize_t
246260 pipe_read(struct kiocb *iocb, struct iov_iter *to)
247261 {
fs/splice.c+4−0
@@ -1597,6 +1597,8 @@ retry: · 1596 unmodified lines
15971597 */
15981598 obuf->flags &= ~PIPE_BUF_FLAG_GIFT;
15991599
1600+ pipe_buf_mark_unmergeable(obuf);
1601+
16001602 obuf->len = len;
16011603 opipe->nrbufs++;
16021604 ibuf->offset += obuf->len;
@@ -1671,6 +1673,8 @@ static int link_pipe(struct pipe_inode_info *ipipe, · 68 unmodified lines
16711673 */
16721674 obuf->flags &= ~PIPE_BUF_FLAG_GIFT;
16731675
1676+ pipe_buf_mark_unmergeable(obuf);
1677+
16741678 if (obuf->len > len)
16751679 obuf->len = len;
16761680
include/linux/pipe_fs_i.h+1−0
@@ -182,6 +182,7 @@ void generic_pipe_buf_get(struct pipe_inode_info *, struct pipe_buffer *); · 181 unmodified lines
182182 int generic_pipe_buf_confirm(struct pipe_inode_info *, struct pipe_buffer *);
183183 int generic_pipe_buf_steal(struct pipe_inode_info *, struct pipe_buffer *);
184184 void generic_pipe_buf_release(struct pipe_inode_info *, struct pipe_buffer *);
185+void pipe_buf_mark_unmergeable(struct pipe_buffer *buf);
185186
186187 extern const struct pipe_buf_operations nosteal_pipe_buf_ops;
187188

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t