Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 16 Dec 2008 03:12:44 +0000 (UTC)
From:      Kip Macy <kmacy@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r186163 - head/sys/netinet6
Message-ID:  <200812160312.mBG3CiVY025068@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: kmacy
Date: Tue Dec 16 03:12:44 2008
New Revision: 186163
URL: http://svn.freebsd.org/changeset/base/186163

Log:
  convert more pointer validation checks to checking against NULL

Modified:
  head/sys/netinet6/icmp6.c
  head/sys/netinet6/nd6.c
  head/sys/netinet6/raw_ip6.c

Modified: head/sys/netinet6/icmp6.c
==============================================================================
--- head/sys/netinet6/icmp6.c	Tue Dec 16 03:05:18 2008	(r186162)
+++ head/sys/netinet6/icmp6.c	Tue Dec 16 03:12:44 2008	(r186163)
@@ -1947,7 +1947,7 @@ icmp6_rip6_input(struct mbuf **mp, int o
 			INP_RUNLOCK(in6p);
 			continue;
 		}
-		if (last) {
+		if (last != NULL) {
 			struct	mbuf *n = NULL;
 
 			/*
@@ -2008,7 +2008,7 @@ icmp6_rip6_input(struct mbuf **mp, int o
 		last = in6p;
 	}
 	INP_INFO_RUNLOCK(&V_ripcbinfo);
-	if (last) {
+	if (last != NULL) {
 		if (last->inp_flags & IN6P_CONTROLOPTS)
 			ip6_savecontrol(last, m, &opts);
 		/* strip intermediate headers */

Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c	Tue Dec 16 03:05:18 2008	(r186162)
+++ head/sys/netinet6/nd6.c	Tue Dec 16 03:12:44 2008	(r186163)
@@ -1642,7 +1642,7 @@ nd6_cache_lladdr(struct ifnet *ifp, stru
 	
 	return (ln);
 done:	
-	if (ln) {
+	if (ln != NULL) {
 		if (flags & ND6_EXCLUSIVE)
 			LLE_WUNLOCK(ln);
 		else
@@ -1716,7 +1716,7 @@ nd6_output_lle(struct ifnet *ifp, struct
 	int flags = 0;
 
 #ifdef INVARIANTS
-	if (lle) {
+	if (lle != NULL) {
 		
 		LLE_WLOCK_ASSERT(lle);
 

Modified: head/sys/netinet6/raw_ip6.c
==============================================================================
--- head/sys/netinet6/raw_ip6.c	Tue Dec 16 03:05:18 2008	(r186162)
+++ head/sys/netinet6/raw_ip6.c	Tue Dec 16 03:12:44 2008	(r186163)
@@ -193,7 +193,7 @@ rip6_input(struct mbuf **mp, int *offp, 
 				continue;
 			}
 		}
-		if (last) {
+		if (last != NULL) {
 			struct mbuf *n = m_copy(m, 0, (int)M_COPYALL);
 
 #ifdef IPSEC
@@ -240,7 +240,7 @@ rip6_input(struct mbuf **mp, int *offp, 
 		INP_RUNLOCK(last);
 	} else
 #endif /* IPSEC */
-	if (last) {
+	if (last != NULL) {
 		if (last->inp_flags & IN6P_CONTROLOPTS ||
 		    last->inp_socket->so_options & SO_TIMESTAMP)
 			ip6_savecontrol(last, m, &opts);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812160312.mBG3CiVY025068>