From nobody Wed Feb 11 08:11:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B935C7619A for ; Wed, 5 Apr 2023 16:58:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233664AbjDEQ6Y (ORCPT ); Wed, 5 Apr 2023 12:58:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229872AbjDEQ5K (ORCPT ); Wed, 5 Apr 2023 12:57:10 -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 CF2336EB4 for ; Wed, 5 Apr 2023 09:54:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680713690; 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=QZshbeXwoidsAPUStOu/ElI81f+RaVvzRteHlRNDwSs=; b=NJv6rvybgrz8U4JezGSdflvTwATv1CviLUd4rAIOtiKUJBBwSPwW9BdvYBesKBEr5icIix lHyfOnpkip6UzHwrEJfueQPEgga7qxenHnkDsmhAi6kD+xIKDATijraq9ohHRXQNdPazik 6tSJoabrlRDBGR0OXW7WQe08SHS/Kj0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-659-7ntbeM6RPUWZ_fvl6pOJLw-1; Wed, 05 Apr 2023 12:54:43 -0400 X-MC-Unique: 7ntbeM6RPUWZ_fvl6pOJLw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1C59F8996E4; Wed, 5 Apr 2023 16:54:42 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 19E08140EBF4; Wed, 5 Apr 2023 16:54:40 +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 20/20] af_unix: Make sendmsg(MSG_SPLICE_PAGES) copy unspliceable data Date: Wed, 5 Apr 2023 17:53:39 +0100 Message-Id: <20230405165339.3468808-21-dhowells@redhat.com> In-Reply-To: <20230405165339.3468808-1-dhowells@redhat.com> References: <20230405165339.3468808-1-dhowells@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 unix_extract_bvec_to_skb() copy it. Signed-off-by: David Howells 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/unix/af_unix.c | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index fee431a089d3..6941be8dae7e 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2160,12 +2160,12 @@ static int queue_oob(struct socket *sock, struct ms= ghdr *msg, struct sock *other /* * Extract pages from an iterator and add them to the socket buffer. */ -static ssize_t unix_extract_bvec_to_skb(struct sk_buff *skb, - struct iov_iter *iter, ssize_t maxsize) +static ssize_t unix_extract_bvec_to_skb(struct sk_buff *skb, struct iov_it= er *iter, + ssize_t maxsize, gfp_t gfp) { struct page *pages[8], **ppages =3D pages; unsigned int i, nr; - ssize_t ret =3D 0; + ssize_t spliced =3D 0, ret =3D 0; =20 while (iter->count > 0) { size_t off, len; @@ -2177,31 +2177,52 @@ static ssize_t unix_extract_bvec_to_skb(struct sk_b= uff *skb, =20 len =3D iov_iter_extract_pages(iter, &ppages, maxsize, nr, 0, &off); if (len <=3D 0) { - if (!ret) - ret =3D len ?: -EIO; + ret =3D len ?: -EIO; break; } =20 i =3D 0; do { + struct page *page =3D pages[i++]; size_t part =3D min_t(size_t, PAGE_SIZE - off, len); + bool put =3D false; + + if (!sendpage_ok(page)) { + const void *p =3D kmap_local_page(page); + void *q; + + q =3D page_frag_memdup(NULL, p + off, part, gfp, + ULONG_MAX); + kunmap_local(p); + if (!q) { + iov_iter_revert(iter, len); + ret =3D -ENOMEM; + goto out; + } + page =3D virt_to_page(q); + off =3D offset_in_page(q); + put =3D true; + } =20 - if (skb_append_pagefrags(skb, pages[i++], off, part) < 0) { - if (!ret) - ret =3D -EMSGSIZE; + ret =3D skb_append_pagefrags(skb, page, off, part); + if (put) + put_page(page); + if (ret < 0) { + iov_iter_revert(iter, len); goto out; } off =3D 0; - ret +=3D part; + spliced +=3D part; maxsize -=3D part; len -=3D part; } while (len > 0); + if (maxsize <=3D 0) break; } =20 out: - return ret; + return spliced ?: ret; } =20 static int unix_stream_sendmsg(struct socket *sock, struct msghdr *msg, @@ -2278,7 +2299,8 @@ static int unix_stream_sendmsg(struct socket *sock, s= truct msghdr *msg, fds_sent =3D true; =20 if (unlikely(msg->msg_flags & MSG_SPLICE_PAGES)) { - size =3D unix_extract_bvec_to_skb(skb, &msg->msg_iter, size); + size =3D unix_extract_bvec_to_skb(skb, &msg->msg_iter, size, + sk->sk_allocation); skb->data_len +=3D size; skb->len +=3D size; skb->truesize +=3D size;