From nobody Tue Feb 22 22:33:31 2022 X-Original-To: dev-commits-src-branches@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 59C2019E0026; Tue, 22 Feb 2022 22:33:31 +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 4K3DTl26jJz3HpX; Tue, 22 Feb 2022 22:33:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645569211; 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=xMGOdRmHHFkgAg2oFY6U5ssiRnv+zpbxprd0LlhmeNw=; b=hV2Uwxm1dS12kjPgGQXzvEDTjvL1qhUW6uycl4wGwIMzFVtalH1bZYY2KSc4ocUHN0rbeu KOZ1ERsy17qUFjygKMQ7LFB4Crtyx5w/vY07df4raanq5QeX3pnO7se19TahK5zD+eeExZ Ef+2yzbDmH47th/aUgx3eXUtBJuURNivBErhJpUiqWuy/+KFaECTMT8f4El5QeNXr3NP9R N/sAN/bD1B7hIfsLhFjWmUOUqeqVGvZP6itJXoWrVQKGXtIG2+e8JIHqedBhEa349A56TR xOtF81UVaTMtqHmgU/9kaUePbdysJrFHrhWAaIHFsrYOAMhHNqPqjq52xy4v8w== 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 2885D4BA5; Tue, 22 Feb 2022 22:33:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21MMXVWD041333; Tue, 22 Feb 2022 22:33:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MMXVAo041332; Tue, 22 Feb 2022 22:33:31 GMT (envelope-from git) Date: Tue, 22 Feb 2022 22:33:31 GMT Message-Id: <202202222233.21MMXVAo041332@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: 4861df17a2af - stable/13 - ipv6: Fix getsockopt() for some IPPROTO_IPV6 level socket options List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 4861df17a2afe81f3fb65bac9f1f992446244bc6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645569211; 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=xMGOdRmHHFkgAg2oFY6U5ssiRnv+zpbxprd0LlhmeNw=; b=b/+3RscHK7tNDb254qslZGCihcej6w5HKVvnyLQx8jLILB+rit4j9kSznWnRuL2QXzBVpm BDA3RvUMXjOkvRm7oj9M6TWUqta1G7UV9mW/vIBb+KKnXGIxpWO6jGziZMaOeEuxCE2SHe l+s4FOpy5llhqt84xmF9nnyMESGh8ZHnfsVCi/SvApktoP5h/VctZuxVwRGzWSTf05qNRb npwpbm85t5L1PsvE4g/MmUE960ffcRHg3W4CUUBLTjJF2ERwhWEclqlSGTlbHwEVFHGZSN WUTpVKK9oAxsU29n14GWlw0ek/ZhXhBnx+nW4vZcuXyiD4956ACCfJsm5PYyRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645569211; a=rsa-sha256; cv=none; b=cO6IVbL2qozB9LyKLwA5a5ZJTanAam94ndDKEn86iMbYEySC1oOKyoZuvsMwPnQWGkavwx naEVdu3+pZjIleODokvKibPEnMp1rcyNQiYEu1shzcTC3IAULGQUf+Q3gqrAmCuUoB4AxH 2S87SPwwX17Ctie9Fsp2E++zTNvbPOuSWcPSJNf5XtNeOLFQUdY8u8qgNR71mTDm0l7Pb/ ymMbFyT6yGXDjV0o17f/97lUPqRexzzt4eb3uQLDl85tflKdCEibEf4wHAdIOLRBfXj889 7patiiRORVG9VFidpRPLnzjLH4cnagSqdfuMRe9wD1/zIu0Smc7uPnBw4flIOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4861df17a2afe81f3fb65bac9f1f992446244bc6 commit 4861df17a2afe81f3fb65bac9f1f992446244bc6 Author: Michael Tuexen AuthorDate: 2021-08-09 07:23:42 +0000 Commit: Michael Tuexen CommitDate: 2022-02-22 22:33:03 +0000 ipv6: Fix getsockopt() for some IPPROTO_IPV6 level socket options Fix getsockopt() for the IPPROTO_IPV6 level socket options with the following names: IPV6_HOPOPTS, IPV6_RTHDR, IPV6_RTHDRDSTOPTS, IPV6_DSTOPTS, and IPV6_NEXTHOP. Reviewed by: markj Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D31458 (cherry picked from commit a8d54fc903cca354572ddd7a890baefd81baa7e8) --- sys/netinet6/ip6_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index de9ed673de79..877d9db508c7 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -2572,7 +2572,7 @@ ip6_pcbopt(int optname, u_char *buf, int len, struct ip6_pktopts **pktopt, pktopt = inp->in6p_outputopts; \ if (pktopt && pktopt->field) { \ optdatalen = min(lenexpr, sopt->sopt_valsize); \ - bcopy(&pktopt->field, optdata, optdatalen); \ + bcopy(pktopt->field, optdata, optdatalen); \ } else { \ free(optdata, M_TEMP); \ optdata = NULL; \