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

Showing the changes to include/linux (1 of 3 files). Show all

Unified · Split

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