From nobody Wed Apr 10 18:28:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VFBCp35X0z5Frh6; Wed, 10 Apr 2024 18:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VFBCp2SNkz4KH6; Wed, 10 Apr 2024 18:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712773702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oUQCIDU+7D2kd1m/Vf/BwN+sTXPn0wZqPNr2lgdVoC4=; b=bX+lVI43Wj90Ki4Ofw0vv+V/BOhiya9G5P4TQozMl1NiM3JJamjCBxZd4yMaIjDfXjcIua E3uw29FK8HGR/LumocPC5Jy7tcLd5E6/GJBn/rZ+njZZrXVF79nYAeZuhzjtbzOtnGmOmF Wxu3wiyfP76gKSGWGI0SH0rcna5kcmRhUpLXYC6mrQhrr6HgztU5nEGFXHWQZ476BbqFtr xY3tJ7BK3q0XF5034j8WVx37fn6ZTSaQcTo1w920HZcpq7AmQfROI2K2smWo98EcRzPr8p i2C8Tdz7Rktdt8lsMXFSrwzPfPzDNnOoj0ZVnREXsuJZCNoMcoBZG95nOfy1ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712773702; a=rsa-sha256; cv=none; b=Z/Zo9v+Kj5/B8M1shRjGTVhkPzq1cRMQALyG4KwOKzb/f0Q74eTlL08f/WPePeyyv4Ir+n zFG8HjfVQJCcySYmW8Z5alwHN2JPMvpTpnyfdOlc3g9Om/IBQoy5VwdSBQiK1ZsYaW+7Jn HLRHU6gHZcYhY1PQ8xj4X4uk+C63KJUTK6Q/uxnEVlrUs+OB+zR15aFHXjeKmtTAw3/YEs kkUK5CFMMaBxreIZGl3I9+W+UGAU5z2UDLwIpuzZ8H6v+f9q2XbUKodZa0aOHfUROxXLQM pphtcI637rRs6vcMIIpIjgGqmKTs4H7a33sntcst8gCBj3O2YDjOgZG4Tp9hAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712773702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oUQCIDU+7D2kd1m/Vf/BwN+sTXPn0wZqPNr2lgdVoC4=; b=yqRWrStmcOJz2KvxwcvMliHRIoq+dy9v94xN8znFF9N0YtjL8VdEfn6vqmyTiCfPKualrA z+SRyADPIGGN9SkFaCbZR1+PrkQ1Eqd90sERRXdDadEugGt2SUA3Vx5BkCttImbUqNRYmz nAaGn1+Cf5q7td9koRRwAcPiOn1HCAHiizGcINJbsUaolfc4ySlvG1RGRy45CLbRSbEsuy 2h0ajylKVQ/0U0KNZLFyi8KtMwsCIa9E+r316psO1SfMlSFYheYS/azp+g8UXbTvqJDuxA SBzKR3BTVPdz6A4b29c7H0yJjFf7xzLyK42eXeZhug+eP2/u3crTPMP4mvJN+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VFBCp23wZzpQL; Wed, 10 Apr 2024 18:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43AISMDr015645; Wed, 10 Apr 2024 18:28:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43AISMfr015642; Wed, 10 Apr 2024 18:28:22 GMT (envelope-from git) Date: Wed, 10 Apr 2024 18:28:22 GMT Message-Id: <202404101828.43AISMfr015642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 0020e1b617dc - main - Revert "sendfile: mark it explicitly as a TCP only feature" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-src-all+owner@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0020e1b617dc71142a5d0c1738e72deaabdfe756 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=0020e1b617dc71142a5d0c1738e72deaabdfe756 commit 0020e1b617dc71142a5d0c1738e72deaabdfe756 Author: Gleb Smirnoff AuthorDate: 2024-04-10 18:28:11 +0000 Commit: Gleb Smirnoff CommitDate: 2024-04-10 18:28:11 +0000 Revert "sendfile: mark it explicitly as a TCP only feature" This reverts commit 3b7aa842e27dcf07181f161b1abde0067ed51e97. --- sys/kern/kern_sendfile.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c index 071c2fbbd436..323e7fcde07b 100644 --- a/sys/kern/kern_sendfile.c +++ b/sys/kern/kern_sendfile.c @@ -649,16 +649,20 @@ sendfile_getsock(struct thread *td, int s, struct file **sock_fp, *sock_fp = NULL; *so = NULL; + /* + * The socket must be a stream socket and connected. + */ error = getsock(td, s, &cap_send_rights, sock_fp); if (error != 0) return (error); *so = (*sock_fp)->f_data; + if ((*so)->so_type != SOCK_STREAM) + return (EINVAL); /* - * sendfile(2) should be supported for every SOCK_STREAM socket. - * However, the support of PF_UNIX/SOCK_STREAM is temporarily degraded - * and IPPROTO_SCTP isn't supported, yet. + * SCTP one-to-one style sockets currently don't work with + * sendfile(). So indicate EINVAL for now. */ - if ((*so)->so_proto->pr_protocol != IPPROTO_TCP) + if ((*so)->so_proto->pr_protocol == IPPROTO_SCTP) return (EINVAL); return (0); }