From patchwork Wed Apr 5 16:53:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 79825 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp458341vqo; Wed, 5 Apr 2023 10:03:10 -0700 (PDT) X-Google-Smtp-Source: AKy350aXnR41eS8CyOj5WZrFukRP/OpukkCDGBioN1JVjySij3+6RkzOhIwVU/G04O8UF6IoHIc2 X-Received: by 2002:a17:906:258c:b0:932:c56a:c19b with SMTP id m12-20020a170906258c00b00932c56ac19bmr3538778ejb.22.1680714190164; Wed, 05 Apr 2023 10:03:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680714190; cv=none; d=google.com; s=arc-20160816; b=f4sOhUvwAmE2cxu8XVBVGQG0fYLM1s9ahXNARxWRJt7CiXuhnOmPiBUlwkF9Oc2ofa rFO6nR1DMO+bCpVtjfnM7lxhGW1slZrsc5ZQNcbX8YEaFcYQAoOSW57Pb3qOGrFb68qi DDAiHeygVIBDXzHa2+rEt+4/ddEFou0i8pmZ0vvbkySuQ+0bZpRohRjnhr9ePW10ZDf2 ulcTL/OqVhcLdFl3HZohpbqa5IjaT0nfBBLNb0gY+TZTdW5wU+AfN3gHcC2OKLO3jLe+ ThVB8XEsraSDT6aLlLlDlvTdVW/y6oQmR84WOL8cfS1Zyn5/W5G6JlkKCR5KoTMbT9P+ /S3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OMwy0qt4L2slgfHXAMvoFhpKJLhShXlB6/4lgaiCeU4=; b=BBr55sBruDrQA/Bto7aPr8EIUa9MxZUmmWtgqfiWSx/9YGCwCI+CMQAGBrrLphDQSH VQ9dw+aKVbWRf0JbeD6KoKJwdzJ8z/G6MY19Sn9q+JP6r+iebeUk3caUafn0C4DLxnAJ 0BZ6Pa6Igc0R40yn3wAl9eVuhPw5AimwzcM440svkgjIN2cfo2M0ZAeKMPPpj7/j/S8x 35qwoQ7TObpg7ravuITG7Qae02dDx0I21gQS1TfMpPD51SIOUqYkn436eTgTwJekBLv4 4GGiIJrC4u/2CtZz4EACMIuYuDqVw75AwkhWtaNmBaS1fuKUiU4vWp6WK2dlez3hThAl CxgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fsPcXU9n; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y20-20020aa7c254000000b00501c4e46efasi593055edo.345.2023.04.05.10.02.37; Wed, 05 Apr 2023 10:03:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fsPcXU9n; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230396AbjDEQ6Q (ORCPT + 99 others); Wed, 5 Apr 2023 12:58:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232112AbjDEQ4o (ORCPT ); Wed, 5 Apr 2023 12:56:44 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1BE56EAE for ; Wed, 5 Apr 2023 09:54:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680713679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OMwy0qt4L2slgfHXAMvoFhpKJLhShXlB6/4lgaiCeU4=; b=fsPcXU9nLDFTuwDCwSmk3GuOvKKwxW65+3X8nj3/Q7ptinpTttZ2puwlrCLtRBA0tYqvKl esBZYOx2u8+cn9b7bl672y8Pr+Sm4NC8khEwfknq+lI+wfbO7NrFmbR7TE8HTB28Gl7+88 CVAJAtQ1e76S4/GjZzXQhxEernt839w= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-160-4RoSPamyNOOyKJ-8OPZdCA-1; Wed, 05 Apr 2023 12:54:36 -0400 X-MC-Unique: 4RoSPamyNOOyKJ-8OPZdCA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 044E23823A0B; Wed, 5 Apr 2023 16:54:34 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2DAE2166B26; Wed, 5 Apr 2023 16:54:31 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , Matthew Wilcox , Al Viro , Christoph Hellwig , Jens Axboe , Jeff Layton , Christian Brauner , Chuck Lever III , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH net-next v4 17/20] ip, udp: Make sendmsg(MSG_SPLICE_PAGES) copy unspliceable data Date: Wed, 5 Apr 2023 17:53:36 +0100 Message-Id: <20230405165339.3468808-18-dhowells@redhat.com> In-Reply-To: <20230405165339.3468808-1-dhowells@redhat.com> References: <20230405165339.3468808-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762356562428796598?= X-GMAIL-MSGID: =?utf-8?q?1762356562428796598?= If sendmsg() with MSG_SPLICE_PAGES encounters a page that shouldn't be spliced - a slab page, for instance, or one with a zero count - make __ip_append_data() copy it. Signed-off-by: David Howells cc: Willem de Bruijn cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: netdev@vger.kernel.org --- net/ipv4/ip_output.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 13d19867ffd3..e34c86b1b59a 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -967,13 +967,32 @@ static int __ip_splice_pages(struct sock *sk, struct sk_buff *skb, struct page *page = NULL, **pages = &page; ssize_t copy = *pcopy; size_t off; + bool put = false; int err; copy = iov_iter_extract_pages(&msg->msg_iter, &pages, copy, 1, 0, &off); if (copy <= 0) return copy ?: -EIO; + if (!sendpage_ok(page)) { + const void *p = kmap_local_page(page); + void *q; + + q = page_frag_memdup(NULL, p + off, copy, + sk->sk_allocation, ULONG_MAX); + kunmap_local(p); + if (!q) { + iov_iter_revert(&msg->msg_iter, copy); + return -ENOMEM; + } + page = virt_to_page(q); + off = offset_in_page(q); + put = true; + } + err = skb_append_pagefrags(skb, page, off, copy); + if (put) + put_page(page); if (err < 0) { iov_iter_revert(&msg->msg_iter, copy); return err;