summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmacy <kmacy@FreeBSD.org>2008-12-16 03:12:44 +0000
committerkmacy <kmacy@FreeBSD.org>2008-12-16 03:12:44 +0000
commitc501489004a473932094587f4ddfd72dd192e55c (patch)
tree9c5e71146496827dcd1b1c6a4660c157680039f9
parente73e7617200018fa199d34702b760f0ac34c11da (diff)
downloadFreeBSD-src-c501489004a473932094587f4ddfd72dd192e55c.zip
FreeBSD-src-c501489004a473932094587f4ddfd72dd192e55c.tar.gz
convert more pointer validation checks to checking against NULL
-rw-r--r--sys/netinet6/icmp6.c4
-rw-r--r--sys/netinet6/nd6.c4
-rw-r--r--sys/netinet6/raw_ip6.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 494cf35..42144e5 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1947,7 +1947,7 @@ icmp6_rip6_input(struct mbuf **mp, int off)
INP_RUNLOCK(in6p);
continue;
}
- if (last) {
+ if (last != NULL) {
struct mbuf *n = NULL;
/*
@@ -2008,7 +2008,7 @@ icmp6_rip6_input(struct mbuf **mp, int off)
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 */
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index fae9816..71d50d0 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1642,7 +1642,7 @@ nd6_cache_lladdr(struct ifnet *ifp, struct in6_addr *from, char *lladdr,
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 ifnet *origifp, struct mbuf *m0,
int flags = 0;
#ifdef INVARIANTS
- if (lle) {
+ if (lle != NULL) {
LLE_WLOCK_ASSERT(lle);
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index aec1b8e..87e1e5a 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -193,7 +193,7 @@ rip6_input(struct mbuf **mp, int *offp, int proto)
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, int proto)
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);
OpenPOWER on IntegriCloud