svn commit: r332820 - stable/11/sys/netinet6

[Jonathan T. Looney]

Author: jtl
Date: Fri Apr 20 14:34:04 2018
New Revision: 332820
URL: https://svnweb.freebsd.org/changeset/base/332820

Log:
  MFC r331484:
    Remove some unneccessary variable sets in IPv6 code, as detected by
    clang's static analyzer.
  
  Sponsored by:	Netflix, Inc.

Modified:
  stable/11/sys/netinet6/dest6.c
  stable/11/sys/netinet6/icmp6.c
  stable/11/sys/netinet6/ip6_output.c
  stable/11/sys/netinet6/udp6_usrreq.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet6/dest6.c
==============================================================================
--- stable/11/sys/netinet6/dest6.c	Fri Apr 20 14:21:37 2018	(r332819)
+++ stable/11/sys/netinet6/dest6.c	Fri Apr 20 14:34:04 2018	(r332820)
@@ -91,7 +91,7 @@ dest6_input(struct mbuf **mp, int *offp, int proto)
 	opt = (u_int8_t *)dstopts + sizeof(struct ip6_dest);
 
 	/* search header for all options. */
-	for (optlen = 0; dstoptlen > 0; dstoptlen -= optlen, opt += optlen) {
+	for (; dstoptlen > 0; dstoptlen -= optlen, opt += optlen) {
 		if (*opt != IP6OPT_PAD1 &&
 		    (dstoptlen < IP6OPT_MINLEN || *(opt + 1) + 2 > dstoptlen)) {
 			IP6STAT_INC(ip6s_toosmall);

Modified: stable/11/sys/netinet6/icmp6.c
==============================================================================
--- stable/11/sys/netinet6/icmp6.c	Fri Apr 20 14:21:37 2018	(r332819)
+++ stable/11/sys/netinet6/icmp6.c	Fri Apr 20 14:34:04 2018	(r332820)
@@ -592,7 +592,6 @@ icmp6_input(struct mbuf **mp, int *offp, int proto)
 			n->m_pkthdr.len = n0len + (noff - off);
 			n->m_next = n0;
 		} else {
-			nip6 = mtod(n, struct ip6_hdr *);
 			IP6_EXTHDR_GET(nicmp6, struct icmp6_hdr *, n, off,
 			    sizeof(*nicmp6));
 			noff = off;

Modified: stable/11/sys/netinet6/ip6_output.c
==============================================================================
--- stable/11/sys/netinet6/ip6_output.c	Fri Apr 20 14:21:37 2018	(r332819)
+++ stable/11/sys/netinet6/ip6_output.c	Fri Apr 20 14:34:04 2018	(r332820)
@@ -1038,7 +1038,7 @@ sendorfree:
 	m = m0->m_nextpkt;
 	m0->m_nextpkt = 0;
 	m_freem(m0);
-	for (m0 = m; m; m = m0) {
+	for (; m; m = m0) {
 		m0 = m->m_nextpkt;
 		m->m_nextpkt = 0;
 		if (error == 0) {

Modified: stable/11/sys/netinet6/udp6_usrreq.c
==============================================================================
--- stable/11/sys/netinet6/udp6_usrreq.c	Fri Apr 20 14:21:37 2018	(r332819)
+++ stable/11/sys/netinet6/udp6_usrreq.c	Fri Apr 20 14:34:04 2018	(r332820)
@@ -208,7 +208,6 @@ udp6_input(struct mbuf **mp, int *offp, int proto)
 	uint8_t nxt;
 
 	ifp = m->m_pkthdr.rcvif;
-	ip6 = mtod(m, struct ip6_hdr *);
 
 #ifndef PULLDOWN_TEST
 	IP6_EXTHDR_CHECK(m, off, sizeof(struct udphdr), IPPROTO_DONE);
@@ -218,6 +217,7 @@ udp6_input(struct mbuf **mp, int *offp, int proto)
 	IP6_EXTHDR_GET(uh, struct udphdr *, m, off, sizeof(*uh));
 	if (!uh)
 		return (IPPROTO_DONE);
+	ip6 = mtod(m, struct ip6_hdr *);
 #endif
 
 	UDPSTAT_INC(udps_ipackets);