convert more pointer validation checks to checking against NULL
This commit is contained in:
parent
d78be3a909
commit
aba53ef0a6
@ -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 */
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user