diff options
| author | darrenr <darrenr@FreeBSD.org> | 2000-08-13 04:31:06 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2000-08-13 04:31:06 +0000 |
| commit | 24d61c1ea6524a1b7910f56be8efa8856dc8def0 (patch) | |
| tree | 93a3df605afd9999f0dbab48bc27492ac19c8a02 /sys/contrib/ipfilter/netinet/ip_fil.c | |
| parent | 8c08c8f2561bed1192e70cf4fc45e37370e1905a (diff) | |
| download | FreeBSD-src-24d61c1ea6524a1b7910f56be8efa8856dc8def0.zip FreeBSD-src-24d61c1ea6524a1b7910f56be8efa8856dc8def0.tar.gz | |
resolve conflicts
Diffstat (limited to 'sys/contrib/ipfilter/netinet/ip_fil.c')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_fil.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.c b/sys/contrib/ipfilter/netinet/ip_fil.c index c9e6901..bd76b39 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil.c +++ b/sys/contrib/ipfilter/netinet/ip_fil.c @@ -1144,8 +1144,10 @@ int dst; return ENOBUFS; MCLGET(m, M_DONTWAIT); - if (!m) + if ((m->m_flags & M_EXT) == 0) { + m_freem(m); return ENOBUFS; + } avail = (m->m_flags & M_EXT) ? MCLBYTES : MHLEN; xtra = MIN(ntohs(oip6->ip6_plen) + sizeof(ip6_t), avail - hlen - sizeof(*icmp) - max_linkhdr); |
