From patchwork Thu Apr 6 09:42:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 80171 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp898449vqo; Thu, 6 Apr 2023 02:54:41 -0700 (PDT) X-Google-Smtp-Source: AKy350ZI63Y3XSiScNSeDxE9RNeyM3uysW9WNiJ9Jb7x+9J/N0CUe7BH+d6kUqyhd7R2FaEMWPVD X-Received: by 2002:a17:907:d603:b0:931:af6a:ad08 with SMTP id wd3-20020a170907d60300b00931af6aad08mr6144285ejc.57.1680774880867; Thu, 06 Apr 2023 02:54:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680774880; cv=none; d=google.com; s=arc-20160816; b=XolgdUMvwoOIsZOjKus2hcIVcbP1zjy+DJWLtNXExGNwXhMTJZJP17TW1IRxZgr4Os OcOcVRlaI2904x+WAm207vY/Bjq4ij3aAPGOxBXYK8CFXrsZIS5SJGomCz3Bf2hhohV2 UruqbbBBRyPwch5CLOomDHGpXkUDdXdehv14Hojbioq8jXv8UKEl0YRK0TZa99QcZgcM MnkTYIeGEbmfIe2SfYoqfIgsfRJKZ/H5kvgMl02Hh0PWoIxOBDjqgI0rvb3EEiDXvqq8 DyLOndRQ1CZoPPvUG4qn7Wx0I/SnLFn0vQTRPbr46mto5YLMugn1HF73MmVQgb2HWN3D 0tmQ== 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=Lhpi7afnUSYBVmFcNV33/AfpfwJkESufDM5kupMXc5M=; b=yYm8wCtLt0spxQ/5K+PzYNzzOlfB+4tD7heI84R5XPZeJU8MASOIykeh/e7fqvLh6I hbpbUasJQe2ySr4e8JKEv5+awljiIpo1IATi37clzazi726q19+duz73TZOHKN4sBYOB Jmd9S2YCecxKI9yewnCsdehdwRcTpbx+TwbcopHZJ+iDbr/15zYj5RCrTCh3Eg6XCg/i F5+eR9HOcUafthovkjF509cjIycLyDYrhC9xjOmyMoHOnHmSnYGsRut7CpbI/DvUtOzp bKNc9Em887InGj4ObOo5881toty/jjt3pXj63ZOx/rHK6HwakiVIJSVIUBakU37Pb6/X An4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="C/KEt8yi"; 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 g24-20020a17090613d800b009332bb8b1fcsi874488ejc.842.2023.04.06.02.54.16; Thu, 06 Apr 2023 02:54:40 -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="C/KEt8yi"; 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 S236618AbjDFJqT (ORCPT + 99 others); Thu, 6 Apr 2023 05:46:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236723AbjDFJow (ORCPT ); Thu, 6 Apr 2023 05:44:52 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C657383F6 for ; Thu, 6 Apr 2023 02:43:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680774217; 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=Lhpi7afnUSYBVmFcNV33/AfpfwJkESufDM5kupMXc5M=; b=C/KEt8yiz8eyWTOqZ1H9mEQeQ5DdGfiyGURpwBjnnyZqacE4V1bSZiKHQqECqyOMLPiMMM EdCVb7ydz5JOYlqM5AFO1rMQVDMcoFJdKflQYc0Yk+pJa7u+X9ZwwLRoP9/pwzJM40rAwu kaG3lF2LqcRfqhgRUI6XnN4tWeriO2Q= 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-387-ZCLBzN6RN_yR-HE_tGR4oA-1; Thu, 06 Apr 2023 05:43:34 -0400 X-MC-Unique: ZCLBzN6RN_yR-HE_tGR4oA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D9DE93C0ED40; Thu, 6 Apr 2023 09:43:33 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id C6DC0202701F; Thu, 6 Apr 2023 09:43: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, David Ahern Subject: [PATCH net-next v5 14/19] ip, udp: Make sendmsg(MSG_SPLICE_PAGES) copy unspliceable data Date: Thu, 6 Apr 2023 10:42:40 +0100 Message-Id: <20230406094245.3633290-15-dhowells@redhat.com> In-Reply-To: <20230406094245.3633290-1-dhowells@redhat.com> References: <20230406094245.3633290-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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?1762420201769562559?= X-GMAIL-MSGID: =?utf-8?q?1762420201769562559?= 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 Ahern 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 c6c318eb3d37..48db7bf475df 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;