git: a8d54fc903cc - main - ipv6: Fix getsockopt() for some IPPROTO_IPV6 level socket options

Michael Tuexen tuexen at FreeBSD.org
Mon Aug 9 08:00:10 UTC 2021


The branch main has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=a8d54fc903cca354572ddd7a890baefd81baa7e8

commit a8d54fc903cca354572ddd7a890baefd81baa7e8
Author:     Michael Tuexen <tuexen at FreeBSD.org>
AuthorDate: 2021-08-09 07:23:42 +0000
Commit:     Michael Tuexen <tuexen at FreeBSD.org>
CommitDate: 2021-08-09 07:29:13 +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
    MFC after:              3 days
    Sponsored by:           Netflix, Inc.
    Differential Revision:  https://reviews.freebsd.org/D31458
---
 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 71c5c4e5a501..fedb6c6b6c78 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -2584,7 +2584,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;						\


More information about the dev-commits-src-all mailing list