From nobody Thu Jan 11 01:23:12 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 4T9RkS4SHbz56hL5; Thu, 11 Jan 2024 01:23:12 +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 4T9RkS3wTRz4Sh0; Thu, 11 Jan 2024 01:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704936192; 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=kBUq6wHRy8TZjRisIVgj8Ri3P/eBB4UJKEiFg6Up3S4=; b=iZ5YK+pwTdpmsbhVn4vqjLQXnWuHALRsZZP09nZqt47jf2n3Svo9mRwsqRqHH9ZK4c5M/J kjQEDg673EBIjqexmWpLSwgF2qry70Wigunbfa0nxDfpGj+1Fyfu9zBPTjbuguYmqz02qW TwDuSAoytHqFjeL3JI3L4yIa1vYg0yAEQBxEQTj0TnbLqmIp33mr9kAyk+1nX3GvASbRPP MdBDxiAb027UUufOVOzp7GsMc/fFHeY9SWRx8dByvwPGH27HFYGGFeKN4khwE0HaFWnX6G EJT498yVS8Ov7G+Bh/P6xLg35qNz+E5ABffOfwWG0n3zcozvJngsnmmfDIawCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704936192; 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=kBUq6wHRy8TZjRisIVgj8Ri3P/eBB4UJKEiFg6Up3S4=; b=G8728ji1nXU02b+d5GK+xnWa79OjexotsRpZGQopo/ssf3JUTnv1sDlT/bpNmB6cbcGDXw PVx/dkVdXxQ1sWS709t7SW0niMXUuLh6chK8nVF4zdVwKs59qCsXbr24lYRHb6sQmpLFHB 7OY+5ToJ+ArQY/56HLcT02m0ex896haBFSaBE871tQUZf67A5WCvXjBgSipTkBOCh2H0wo uwynbMXL42pZKV7NSsnplC6CiQAoD29mOoTgJdyX5NIdonfgys3X+pmqFj5FJqTJZ3+Z+r hBy/7fKD0K+uiVg+OvyIDZFAnbEemQXmzMDxcBQuA7FXXogZMK+gIe1OTX2GpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704936192; a=rsa-sha256; cv=none; b=w8dddyOKy7/fA6/+EzkawVG0Rp0BZ94bN3Hb4SftgswphmrVKUrGcGOieHnhCXd8naim4N 59Z4ElEY8aaTekTHGlCfhJMM+BIqy9JvvpnfLdZHLkt2qmVtyQ9k5fy2dQRseXgMiwwX/4 uzIe8F4zDh0lvhishV5QDPe2tdAdg0I/+doXYQ7yJK89fuHCKvkDA8BKkB2/+/awDdrJkw fUpexdTIVKHuwwWHUWJbMMRcPXUpmgqv+YNxEkiAC1rqP5muUmQj8c83PzRKKP3gGd8es9 cntW3CU3NUpRenMJg84dkNx1OegH6rEfgP/11ylMhcmZ7q2k8LeclqPhcRndGA== 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 4T9RkS31c3zyk3; Thu, 11 Jan 2024 01:23:12 +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 40B1NCVo088905; Thu, 11 Jan 2024 01:23:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40B1NCQj088902; Thu, 11 Jan 2024 01:23:12 GMT (envelope-from git) Date: Thu, 11 Jan 2024 01:23:12 GMT Message-Id: <202401110123.40B1NCQj088902@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a4925f0f8cf7 - stable/14 - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a4925f0f8cf76c32140d7c2077aa9628de20630f Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a4925f0f8cf76c32140d7c2077aa9628de20630f commit a4925f0f8cf76c32140d7c2077aa9628de20630f Author: Michael Tuexen AuthorDate: 2023-11-05 14:28:54 +0000 Commit: Ed Maste CommitDate: 2024-01-11 01:22:52 +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 ++++++++ sys/netinet6/udp6_usrreq.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 4ea0efad3491..7329600ecc79 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -897,6 +897,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); @@ -944,6 +948,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); diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 35d68e164145..c8b38c24d193 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -1243,7 +1243,7 @@ udp6_disconnect(struct socket *so) #define UDP6_PROTOSW \ .pr_type = SOCK_DGRAM, \ .pr_flags = PR_ATOMIC|PR_ADDR|PR_CAPATTACH, \ - .pr_ctloutput = ip6_ctloutput, \ + .pr_ctloutput = udp_ctloutput, \ .pr_abort = udp6_abort, \ .pr_attach = udp6_attach, \ .pr_bind = udp6_bind, \