From nobody Fri Jan 12 17:50:49 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 4TBTbY451jz57FRm; Fri, 12 Jan 2024 17:50:49 +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 4TBTbY3dQmz4hwl; Fri, 12 Jan 2024 17:50:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705081849; 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=XuKFWaw19+8oCjGX/HHWSPum8USxK6SV+nSXh/VVOEM=; b=A8eNPagXZumWQTksXTGSdtXTm2mdLSDK3yMJCN33XQQkCJGM/KIIYpQ8bl6DxDHtViDlkL 6BqgDf4kyEy0YNt1QpnySGlRGy9zZ8RODSSOalLHVLUPKxEXfuWDCUXDArZ4dN9oI/WFwF UYbEkqNMi5A65XbgAmamNvc6IMIv+AZ2OEtyjP/krBDo2JuGMcZASLJPZl0tW73Y1oiVhu bFbrRR41UFDymjTk4ccW2QOJgWpolpVIns8QgoVBPBlsTCVFBGPfCShCP5WtJkz7hZmEii FaSvT3gvZqT7ZH54nJ0I2WYbwATYC9Tus73zPCa9i/xnV09MVuw4IAQ1etLk1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705081849; 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=XuKFWaw19+8oCjGX/HHWSPum8USxK6SV+nSXh/VVOEM=; b=dOBGXluqFC9TrdUS+BlPQkp7RjMyqUbzTRBxh3q2/PtPa65yDkmb7JUzr8rFvyLz0+N9fo 6m4Pvqc/m5ghP7W/XkDj8jS+8wifpXsMy8sOis4fvOZ4Nr0MilvO/hXxglEkDwh/bzYtdh /tXYLsQDo86bEuXP82NvnI7RQh4xG+2mamIP1/kA5PuRZsla5c2apZQW03GYslO6/UsA57 6RB74BmHwn/u04mGTMgkP++tufDR7W0f0FKHyx2DnSWV6UEQF4SvYfXsKhIlz1KcnMkJ66 yC7cfykpSwfu+zCk363w3xonZ3jmVWyubhiWEbvc1POvrASIohT8939z8aiCLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705081849; a=rsa-sha256; cv=none; b=iiBcbpuCFoxRCdB5w5atb8w8J/ODGKBqIydMuC6MqNANhKUMwysUP1C2kJUbW1umhE6V++ f3UlE0Sue+tTLZj6ahD713J3N8z4+/5eT5EdFFwCv3xTaO55FqMsZ/HJjcSRdH6s+lZGw/ u7MOd5toz/DzMQXAsRPVtejVyFZwl5jAYiFhRHLJqp6kK2HVBYMS4LkOntyk5eFyEpfviO Z0mj3aO+VjzWKj4SE/FvhJAsAmsoExSR9SHzHBUEnOnb4bLqjNdGKsHFfpdsGmXf9jz6J0 bfhxCbc8DAGOTGTY/O3AoyCABH+2Rz73zdF/KuV6SNPPg4OU2i2eDox0cU8vQg== 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 4TBTbY2gr8z1B3d; Fri, 12 Jan 2024 17:50:49 +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 40CHonRr093053; Fri, 12 Jan 2024 17:50:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CHoniC093050; Fri, 12 Jan 2024 17:50:49 GMT (envelope-from git) Date: Fri, 12 Jan 2024 17:50:49 GMT Message-Id: <202401121750.40CHoniC093050@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 3b766249d9f0 - stable/13 - udplite: make socketoption available on IPv6 sockets 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: owner-dev-commits-src-all@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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3b766249d9f04a4cb8d9d44c98853611e02bfd6d Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3b766249d9f04a4cb8d9d44c98853611e02bfd6d commit 3b766249d9f04a4cb8d9d44c98853611e02bfd6d Author: Michael Tuexen AuthorDate: 2023-11-05 14:28:54 +0000 Commit: Michael Tuexen CommitDate: 2024-01-12 17:35:25 +0000 udplite: make socketoption available on IPv6 sockets This patch allows the IPPROTO_UDPLITE-level socket options UDPLITE_SEND_CSCOV and UDPLITE_RECV_CSCOV to be used on AF_INET6 sockets in addition to AF_INET sockets. Reviewed by: ae, rscheff MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42430 (cherry picked from commit 03c3a70abe5e9fa259b954de78ae69229fa9c99f) --- sys/netinet/udp_usrreq.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index ea9ff161e429..c868bf777103 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1009,6 +1009,10 @@ udp_ctloutput(struct socket *so, struct sockopt *sopt) #if defined(IPSEC) || defined(IPSEC_SUPPORT) #ifdef INET case UDP_ENCAP: + if (!INP_CHECK_SOCKAF(so, AF_INET)) { + INP_WUNLOCK(inp); + return (EINVAL); + } if (!IPSEC_ENABLED(ipv4)) { INP_WUNLOCK(inp); return (ENOPROTOOPT); @@ -1056,6 +1060,10 @@ udp_ctloutput(struct socket *so, struct sockopt *sopt) #if defined(IPSEC) || defined(IPSEC_SUPPORT) #ifdef INET case UDP_ENCAP: + if (!INP_CHECK_SOCKAF(so, AF_INET)) { + INP_WUNLOCK(inp); + return (EINVAL); + } if (!IPSEC_ENABLED(ipv4)) { INP_WUNLOCK(inp); return (ENOPROTOOPT);