d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increase errors, not queue drops, in cases the module is supplied

Browse Source 
with a bad packet or if mbuf allocation failes.
This commit is contained in:
Gleb Smirnoff 2014-09-19 05:43:38 +00:00
parent 22bfa4f5b1
commit a6f2696932
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/net/if_gre.c
View File

@ -361,7 +361,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
* be encapsulated.
*/
if (ip->ip_off & htons(IP_MF | IP_OFFMASK)) {
_IF_DROP(&ifp->if_snd);
ifp->if_oerrors++;
m_freem(m);
error = EINVAL; /* is there better errno? */
goto end;
@ -390,7 +390,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
if ((m->m_data - msiz) < m->m_pktdat) {
m0 = m_gethdr(M_NOWAIT, MT_DATA);
if (m0 == NULL) {
_IF_DROP(&ifp->if_snd);
ifp->if_oerrors++;
m_freem(m);
error = ENOBUFS;
goto end;
@ -415,7 +415,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
memcpy((caddr_t)(ip + 1), &mob_h, (unsigned)msiz);
ip->ip_len = htons(ntohs(ip->ip_len) + msiz);
} else { /* AF_INET */
_IF_DROP(&ifp->if_snd);
ifp->if_oerrors++;
m_freem(m);
error = EINVAL;
goto end;
@ -440,7 +440,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
break;
#endif
default:
_IF_DROP(&ifp->if_snd);
ifp->if_oerrors++;
m_freem(m);
error = EAFNOSUPPORT;
goto end;
@ -452,14 +452,14 @@ gre_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
hdrlen += sizeof(uint32_t);
M_PREPEND(m, hdrlen, M_NOWAIT);
} else {
_IF_DROP(&ifp->if_snd);
ifp->if_oerrors++;
m_freem(m);
error = EINVAL;
goto end;
}
if (m == NULL) { /* mbuf allocation failed */
_IF_DROP(&ifp->if_snd);
ifp->if_oerrors++;
error = ENOBUFS;
goto end;
}