From patchwork Wed Jan 23 14:19:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jann Horn X-Patchwork-Id: 10777267 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 790A1139A for ; Wed, 23 Jan 2019 14:19:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A0C72C625 for ; Wed, 23 Jan 2019 14:19:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 681792C63E; Wed, 23 Jan 2019 14:19:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1FFF2C8A0 for ; Wed, 23 Jan 2019 14:19:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726203AbfAWOTZ (ORCPT ); Wed, 23 Jan 2019 09:19:25 -0500 Received: from mail-yw1-f73.google.com ([209.85.161.73]:47880 "EHLO mail-yw1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726183AbfAWOTZ (ORCPT ); Wed, 23 Jan 2019 09:19:25 -0500 Received: by mail-yw1-f73.google.com with SMTP id m200so1188449ywd.14 for ; Wed, 23 Jan 2019 06:19:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=YdTZcj4awLkuiDDlEY8FD2E/jDvXKOg3LBytxcu7mVU=; b=lu+BVVEYMxAL/KrTfwYAlxgvot43Q/Mns6Yeh7/yIyOJV29nPKkT9lUxroKxb1UTol x9WSGCNTyweuQ4Hv7kKPhavqo3M7SpYnWEQ0s8ku/f0CqSEnBbHwYRgaVRV0bqutWRSZ EXrhfRZFq4j8oePmj/cTz1Ji8I+p+TjhJcb2hdlEB5PrA9mM2+Rbev3Q+Y3LUkDrwkz7 bIWaMraK7RIayMEV4HxHAU0EJlK3mh+/KfeeF9jBtoqcGBZQr/Goc6Nd7KYVB+wUk8HI iFFmaDZS2ne8zreF9mb5yh00ekU7dqZwcXid8gI60csUYzoo3zuXVpq6hiXtI6BRLclb H6+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=YdTZcj4awLkuiDDlEY8FD2E/jDvXKOg3LBytxcu7mVU=; b=pbJAjC3SFlnC/CncON+Hvf7axiOM2u/yO6r4a0rt+t96U2EDya4Rvbzp+n21ZzeRn2 MkSZVmOClpkq8A3vSnPCzYjg2iMQTaMJ0ynIYSA3NEg2oPhOdvJ02kRK+jEAdqSOUxgR hh++0uuL+PURht97s60Uh5OHFC6N0dBWzG6sctLJKovzGgsrf9+O7mi/zDMQIugNgBbs 0ZReY2+1skHtL66SC1dy3lXIrxOYvp+D2zOyj+OdnVjCbIfr2Xk1of5DbIlINw5xECu8 t2NEOSlstFZKX7s2AS4T91zpddOMls298ckF79BEdBeJADaBzADmZiIbWrf121gmKN5I XzQg== X-Gm-Message-State: AJcUukdEn/ZtC8sBMq9H7dXTQYSXpQ2n3P7jEkInEaluejdsKeKwOwJK tAOyEl9YxoS7SdszG9uFjwLTF0sC0w== X-Google-Smtp-Source: ALg8bN7juJ6hMcbdu4GR7lWA1uM1JYyMs7fQif2GCpFQfVJXuVsShRI+e6riORdnPK9ZF0h4hlvldL61lA== X-Received: by 2002:a25:3b03:: with SMTP id i3mr686453yba.57.1548253163833; Wed, 23 Jan 2019 06:19:23 -0800 (PST) Date: Wed, 23 Jan 2019 15:19:17 +0100 Message-Id: <20190123141918.238286-1-jannh@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.20.1.321.g9e740568ce-goog Subject: [PATCH v2 1/2] splice: don't merge into linked buffers From: Jann Horn To: Al Viro , Miklos Szeredi , Jens Axboe , Jens Axboe , jannh@google.com Cc: Eric Biggers , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Kees Cook Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(). Cc: Fixes: 7c77f0b3f920 ("splice: implement pipe to pipe splicing") Fixes: 70524490ee2e ("[PATCH] splice: add support for sys_tee()") Suggested-by: Al Viro Signed-off-by: Jann Horn --- Al wasn't entirely happy with the approach I took for v1, so sending a different fix here. fs/pipe.c | 14 ++++++++++++++ fs/splice.c | 4 ++++ include/linux/pipe_fs_i.h | 1 + 3 files changed, 19 insertions(+) diff --git a/fs/pipe.c b/fs/pipe.c index bdc5d3c0977d..c51750ed4011 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -234,6 +234,14 @@ static const struct pipe_buf_operations anon_pipe_buf_ops = { .get = generic_pipe_buf_get, }; +static const struct pipe_buf_operations anon_pipe_buf_nomerge_ops = { + .can_merge = 0, + .confirm = generic_pipe_buf_confirm, + .release = anon_pipe_buf_release, + .steal = anon_pipe_buf_steal, + .get = generic_pipe_buf_get, +}; + static const struct pipe_buf_operations packet_pipe_buf_ops = { .can_merge = 0, .confirm = generic_pipe_buf_confirm, @@ -242,6 +250,12 @@ static const struct pipe_buf_operations packet_pipe_buf_ops = { .get = generic_pipe_buf_get, }; +void pipe_buf_mark_unmergeable(struct pipe_buffer *buf) +{ + if (buf->ops == &anon_pipe_buf_ops) + buf->ops = &anon_pipe_buf_nomerge_ops; +} + static ssize_t pipe_read(struct kiocb *iocb, struct iov_iter *to) { diff --git a/fs/splice.c b/fs/splice.c index de2ede048473..90c29675d573 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1597,6 +1597,8 @@ static int splice_pipe_to_pipe(struct pipe_inode_info *ipipe, */ obuf->flags &= ~PIPE_BUF_FLAG_GIFT; + pipe_buf_mark_unmergeable(obuf); + obuf->len = len; opipe->nrbufs++; ibuf->offset += obuf->len; @@ -1671,6 +1673,8 @@ static int link_pipe(struct pipe_inode_info *ipipe, */ obuf->flags &= ~PIPE_BUF_FLAG_GIFT; + pipe_buf_mark_unmergeable(obuf); + if (obuf->len > len) obuf->len = len; diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h index 5a3bb3b7c9ad..3ecd7ea212ae 100644 --- a/include/linux/pipe_fs_i.h +++ b/include/linux/pipe_fs_i.h @@ -182,6 +182,7 @@ void generic_pipe_buf_get(struct pipe_inode_info *, struct pipe_buffer *); int generic_pipe_buf_confirm(struct pipe_inode_info *, struct pipe_buffer *); int generic_pipe_buf_steal(struct pipe_inode_info *, struct pipe_buffer *); void generic_pipe_buf_release(struct pipe_inode_info *, struct pipe_buffer *); +void pipe_buf_mark_unmergeable(struct pipe_buffer *buf); extern const struct pipe_buf_operations nosteal_pipe_buf_ops; From patchwork Wed Jan 23 14:19:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jann Horn X-Patchwork-Id: 10777271 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6B44113BF for ; Wed, 23 Jan 2019 14:19:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59A302C8A6 for ; Wed, 23 Jan 2019 14:19:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 56FFA2C8A7; Wed, 23 Jan 2019 14:19:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B89BF2C8A7 for ; Wed, 23 Jan 2019 14:19:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726891AbfAWOT3 (ORCPT ); Wed, 23 Jan 2019 09:19:29 -0500 Received: from mail-qt1-f201.google.com ([209.85.160.201]:37580 "EHLO mail-qt1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726880AbfAWOT3 (ORCPT ); Wed, 23 Jan 2019 09:19:29 -0500 Received: by mail-qt1-f201.google.com with SMTP id d31so2557859qtc.4 for ; Wed, 23 Jan 2019 06:19:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=lauieMoR6mplnrnDEREtCol1sUo9ohBTLyuY9w4HtBk=; b=NXRcGOp5W5Ssjdh3Im3Z6KMuxPIaY9k5ldjq4SRdmNCOnYgCcA5lIJLgLRLj36spUX UbMAcl+XB4V4C6lt9183RWMPeYmk540xiY2xVHZxA7pY+42d2MgiejxOa9Y6IgH95SGV nTKW346QZR2DroQ/8eYPtxcU/Hj3CsdDh0TvVRF6Ociu/5f7Je6KbSZ9Ruv0CSwg5EwJ tgfUVQXfOmvVogpiVDfWgk8sj2bgzrqetbaPWo+X3rdYa4y1yHPar9/HIRUwVZK8qFiv 1MoDIgCfpStQSaOMi16hRjHmzeVRvPs1NhUOd1vdXGeMCXoHtZvwKRja+lpUPM3k9xwz Dlcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=lauieMoR6mplnrnDEREtCol1sUo9ohBTLyuY9w4HtBk=; b=n7466z9rhTNfxg9Q45hPlM7F8ylW9wA4mWFBdmr0JrfZKOGHGnWj9ebE3jujhl3Hta 2mmpVq2Lwto9iIgFo5DC5spX6HQHgouJvUNcO+eY+KerGvH/+BPbic83u5JPKhUv1hAS LHbgDwNryWHnZs6GyvimIbqtghmrjuDuiOMaymbiwPXMICHpIDgoEfpHcn+M0220clIV H++wmWycmd7zlrh8iqrs9LXMtFrFiFVSg4QaPuClKPmetDh9zpQxSYSKvwmtFUryotKN kqS210duGj9jvuhqAoWem8D9kLPtuIxVCJZKJfxus/WgydTDfAJUTFu5tsUproPLfmHc rLdw== X-Gm-Message-State: AJcUukewlpxGjPjgKPQpYUSMKPIzplHnxfgY5YbujBuzmP9MdOHyiU0e rw6VhtfiGFklaMTcC18iAZSMQEuI5w== X-Google-Smtp-Source: ALg8bN6uQhEi6JiUzSDcrTrYhpjw86tPlBRanZqgED1nJ/llFX5lNdsCGTm29Inx0W31X+gU+g32wKfqYA== X-Received: by 2002:aed:39c7:: with SMTP id m65mr1644915qte.2.1548253168224; Wed, 23 Jan 2019 06:19:28 -0800 (PST) Date: Wed, 23 Jan 2019 15:19:18 +0100 In-Reply-To: <20190123141918.238286-1-jannh@google.com> Message-Id: <20190123141918.238286-2-jannh@google.com> Mime-Version: 1.0 References: <20190123141918.238286-1-jannh@google.com> X-Mailer: git-send-email 2.20.1.321.g9e740568ce-goog Subject: [PATCH v2 2/2] pipe: stop using ->can_merge From: Jann Horn To: Al Viro , Miklos Szeredi , Jens Axboe , Jens Axboe , jannh@google.com Cc: Eric Biggers , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Kees Cook Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Al Viro pointed out that since there is only one pipe buffer type to which new data can be appended, it isn't necessary to have a ->can_merge field in struct pipe_buf_operations, we can just check for a magic type. Suggested-by: Al Viro Signed-off-by: Jann Horn --- fs/pipe.c | 20 ++++++++++++++++---- fs/splice.c | 4 ---- include/linux/pipe_fs_i.h | 7 ------- kernel/relay.c | 1 - kernel/trace/trace.c | 2 -- net/smc/smc_rx.c | 1 - 6 files changed, 16 insertions(+), 19 deletions(-) diff --git a/fs/pipe.c b/fs/pipe.c index c51750ed4011..0ff09b490ddf 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -226,8 +226,8 @@ void generic_pipe_buf_release(struct pipe_inode_info *pipe, } EXPORT_SYMBOL(generic_pipe_buf_release); +/* New data written to a pipe may be appended to a buffer with this type. */ static const struct pipe_buf_operations anon_pipe_buf_ops = { - .can_merge = 1, .confirm = generic_pipe_buf_confirm, .release = anon_pipe_buf_release, .steal = anon_pipe_buf_steal, @@ -235,7 +235,6 @@ static const struct pipe_buf_operations anon_pipe_buf_ops = { }; static const struct pipe_buf_operations anon_pipe_buf_nomerge_ops = { - .can_merge = 0, .confirm = generic_pipe_buf_confirm, .release = anon_pipe_buf_release, .steal = anon_pipe_buf_steal, @@ -243,19 +242,32 @@ static const struct pipe_buf_operations anon_pipe_buf_nomerge_ops = { }; static const struct pipe_buf_operations packet_pipe_buf_ops = { - .can_merge = 0, .confirm = generic_pipe_buf_confirm, .release = anon_pipe_buf_release, .steal = anon_pipe_buf_steal, .get = generic_pipe_buf_get, }; +/** + * pipe_buf_mark_unmergeable - mark a &struct pipe_buffer as unmergeable + * @buf: the buffer to mark + * + * Description: + * This function ensures that no future writes will be merged into the + * given &struct pipe_buffer. This is necessary when multiple pipe buffers + * share the same backing page. + */ void pipe_buf_mark_unmergeable(struct pipe_buffer *buf) { if (buf->ops == &anon_pipe_buf_ops) buf->ops = &anon_pipe_buf_nomerge_ops; } +static bool pipe_buf_can_merge(struct pipe_buffer *buf) +{ + return buf->ops == &anon_pipe_buf_ops; +} + static ssize_t pipe_read(struct kiocb *iocb, struct iov_iter *to) { @@ -393,7 +405,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from) struct pipe_buffer *buf = pipe->bufs + lastbuf; int offset = buf->offset + buf->len; - if (buf->ops->can_merge && offset + chars <= PAGE_SIZE) { + if (pipe_buf_can_merge(buf) && offset + chars <= PAGE_SIZE) { ret = pipe_buf_confirm(pipe, buf); if (ret) goto out; diff --git a/fs/splice.c b/fs/splice.c index 90c29675d573..fc71e9733f7a 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -138,7 +138,6 @@ static int page_cache_pipe_buf_confirm(struct pipe_inode_info *pipe, } const struct pipe_buf_operations page_cache_pipe_buf_ops = { - .can_merge = 0, .confirm = page_cache_pipe_buf_confirm, .release = page_cache_pipe_buf_release, .steal = page_cache_pipe_buf_steal, @@ -156,7 +155,6 @@ static int user_page_pipe_buf_steal(struct pipe_inode_info *pipe, } static const struct pipe_buf_operations user_page_pipe_buf_ops = { - .can_merge = 0, .confirm = generic_pipe_buf_confirm, .release = page_cache_pipe_buf_release, .steal = user_page_pipe_buf_steal, @@ -326,7 +324,6 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos, EXPORT_SYMBOL(generic_file_splice_read); const struct pipe_buf_operations default_pipe_buf_ops = { - .can_merge = 0, .confirm = generic_pipe_buf_confirm, .release = generic_pipe_buf_release, .steal = generic_pipe_buf_steal, @@ -341,7 +338,6 @@ static int generic_pipe_buf_nosteal(struct pipe_inode_info *pipe, /* Pipe buffer operations for a socket and similar. */ const struct pipe_buf_operations nosteal_pipe_buf_ops = { - .can_merge = 0, .confirm = generic_pipe_buf_confirm, .release = generic_pipe_buf_release, .steal = generic_pipe_buf_nosteal, diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h index 3ecd7ea212ae..787d224ff43e 100644 --- a/include/linux/pipe_fs_i.h +++ b/include/linux/pipe_fs_i.h @@ -73,13 +73,6 @@ struct pipe_inode_info { * in fs/pipe.c for the pipe and generic variants of these hooks. */ struct pipe_buf_operations { - /* - * This is set to 1, if the generic pipe read/write may coalesce - * data into an existing buffer. If this is set to 0, a new pipe - * page segment is always used for new data. - */ - int can_merge; - /* * ->confirm() verifies that the data in the pipe buffer is there * and that the contents are good. If the pages in the pipe belong diff --git a/kernel/relay.c b/kernel/relay.c index 04f248644e06..db3e419c25a6 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -1175,7 +1175,6 @@ static void relay_pipe_buf_release(struct pipe_inode_info *pipe, } static const struct pipe_buf_operations relay_pipe_buf_ops = { - .can_merge = 0, .confirm = generic_pipe_buf_confirm, .release = relay_pipe_buf_release, .steal = generic_pipe_buf_steal, diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index c521b7347482..f380139e972c 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -5823,7 +5823,6 @@ static void tracing_spd_release_pipe(struct splice_pipe_desc *spd, } static const struct pipe_buf_operations tracing_pipe_buf_ops = { - .can_merge = 0, .confirm = generic_pipe_buf_confirm, .release = generic_pipe_buf_release, .steal = generic_pipe_buf_steal, @@ -6843,7 +6842,6 @@ static void buffer_pipe_buf_get(struct pipe_inode_info *pipe, /* Pipe buffer operations for a buffer. */ static const struct pipe_buf_operations buffer_pipe_buf_ops = { - .can_merge = 0, .confirm = generic_pipe_buf_confirm, .release = buffer_pipe_buf_release, .steal = generic_pipe_buf_steal, diff --git a/net/smc/smc_rx.c b/net/smc/smc_rx.c index bbcf0fe4ae10..413a6abf227e 100644 --- a/net/smc/smc_rx.c +++ b/net/smc/smc_rx.c @@ -136,7 +136,6 @@ static int smc_rx_pipe_buf_nosteal(struct pipe_inode_info *pipe, } static const struct pipe_buf_operations smc_pipe_ops = { - .can_merge = 0, .confirm = generic_pipe_buf_confirm, .release = smc_rx_pipe_buf_release, .steal = smc_rx_pipe_buf_nosteal,