diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 2001-05-11 17:20:13 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2001-05-11 17:20:13 +0000 |
| commit | c3c13d7458f1ad5ad8bf5d2194e6b97bc8889f5a (patch) | |
| tree | 1e3e73f116d9558b78db79cd0fe2cd0ee7a88c8f /sys/net | |
| parent | 8819d23adec5eb15027bcf9a8e810b950082d96e (diff) | |
Check m_pullup() and m_pullup2() return for NULL, not 0; itojun@ ok
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_arcsubr.c | 4 | ||||
| -rw-r--r-- | sys/net/if_atmsubr.c | 5 | ||||
| -rw-r--r-- | sys/net/if_gre.c | 8 |
3 files changed, 9 insertions, 8 deletions
diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c index 7e9cf578852..b84d955ee0b 100644 --- a/sys/net/if_arcsubr.c +++ b/sys/net/if_arcsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_arcsubr.c,v 1.5 1997/02/24 13:33:57 niklas Exp $ */ +/* $OpenBSD: if_arcsubr.c,v 1.6 2001/05/11 17:20:09 aaron Exp $ */ /* $NetBSD: if_arcsubr.c,v 1.8 1996/05/07 02:40:29 thorpej Exp $ */ /* @@ -248,7 +248,7 @@ arc_output(ifp, m0, dst, rt0) if (m == 0) senderr(ENOBUFS); m = m_pullup(m, ARC_HDRNEWLEN); - if (m == 0) + if (m == NULL) senderr(ENOBUFS); ah = mtod(m, struct arc_header *); ah->arc_type = atype; diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c index a139bcc053c..b81fecc5354 100644 --- a/sys/net/if_atmsubr.c +++ b/sys/net/if_atmsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atmsubr.c,v 1.13 2000/09/12 04:09:11 itojun Exp $ */ +/* $OpenBSD: if_atmsubr.c,v 1.14 2001/05/11 17:20:10 aaron Exp $ */ /* * @@ -298,7 +298,8 @@ atm_input(ifp, ah, m, rxhand) */ if (ATM_PH_FLAGS(ah) & ATM_PH_LLCSNAP) { struct atmllc *alc; - if (m->m_len < sizeof(*alc) && (m = m_pullup(m, sizeof(*alc))) == 0) + if (m->m_len < sizeof(*alc) && + (m = m_pullup(m, sizeof(*alc))) == NULL) return; /* failed */ alc = mtod(m, struct atmllc *); if (bcmp(alc, ATMLLC_HDR, 6)) { diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 7b8145f8d9c..2d5f6217de4 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gre.c,v 1.9 2001/03/25 07:10:47 csapuntz Exp $ */ +/* $OpenBSD: if_gre.c,v 1.10 2001/05/11 17:20:10 aaron Exp $ */ /* $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */ /* @@ -196,7 +196,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, if (m->m_len < sizeof(struct ip)) { m = m_pullup(m, sizeof(struct ip)); - if (m == 0) { + if (m == NULL) { IF_DROP(&ifp->if_snd); recursions = 0; return (ENOBUFS); @@ -207,7 +207,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, if (m->m_len < inp->ip_hl << 2) { m = m_pullup(m, sizeof(inp->ip_hl << 2)); - if (m == 0) { + if (m == NULL) { IF_DROP(&ifp->if_snd); recursions = 0; return (ENOBUFS); @@ -292,7 +292,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, case AF_INET: if (m->m_len < sizeof(struct ip)) { m = m_pullup(m, sizeof(struct ip)); - if (m == 0) { + if (m == NULL) { IF_DROP(&ifp->if_snd); recursions = 0; return (ENOBUFS); |