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

Make the frameworkl responsible for not passing the nodes a NULL mbuf pointer.

Browse Source 
this allows the nodes to not test for this..

Submitted by:	Gleb Smirnoff <glebius@cell.sick.ru>
This commit is contained in:
Julian Elischer 2004-06-25 21:11:14 +00:00
parent 45671a9eb6
commit 1cf3fa7934
6 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/netgraph/ng_UI.c
View File

@ -178,8 +178,8 @@ ng_UI_rcvdata(hook_p hook, item_p item)
if (hook == priv->downlink) { if (hook == priv->downlink) {
u_char *start, *ptr; u_char *start, *ptr;
if (!m || (m->m_len < MAX_ENCAPS_HDR if (m->m_len < MAX_ENCAPS_HDR
&& !(m = m_pullup(m, MAX_ENCAPS_HDR)))) && !(m = m_pullup(m, MAX_ENCAPS_HDR)))
ERROUT(ENOBUFS); ERROUT(ENOBUFS);
ptr = start = mtod(m, u_char *); ptr = start = mtod(m, u_char *);

7
sys/netgraph/ng_base.c
View File

@ -2139,6 +2139,13 @@ ng_snd_item(item_p item, int queue)
* the node is derivable from the hook. * the node is derivable from the hook.
* References are held on both by the item. * References are held on both by the item.
*/ */
/* Protect nodes from sending NULL pointers
* to each other
*/
if (m == NULL)
return (EINVAL);
CHECK_DATA_MBUF(NGI_M(item)); CHECK_DATA_MBUF(NGI_M(item));
if (hook == NULL) { if (hook == NULL) {
NG_FREE_ITEM(item); NG_FREE_ITEM(item);

5
sys/netgraph/ng_eiface.c
View File

@ -587,11 +587,6 @@ ng_eiface_rcvdata(hook_p hook, item_p item)
/* Meta-data ends its life here... */ /* Meta-data ends its life here... */
NG_FREE_ITEM(item); NG_FREE_ITEM(item);
if (m == NULL)
{
printf("ng_eiface: mbuf is null.\n");
return (EINVAL);
}
if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING)) { if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING)) {
NG_FREE_M(m); NG_FREE_M(m);
return (ENETDOWN); return (ENETDOWN);

2
sys/netgraph/ng_iface.c
View File

@ -746,8 +746,6 @@ ng_iface_rcvdata(hook_p hook, item_p item)
/* Sanity checks */ /* Sanity checks */
KASSERT(iffam != NULL, ("%s: iffam", __func__)); KASSERT(iffam != NULL, ("%s: iffam", __func__));
M_ASSERTPKTHDR(m); M_ASSERTPKTHDR(m);
if (m == NULL)
return (EINVAL);
if ((ifp->if_flags & IFF_UP) == 0) { if ((ifp->if_flags & IFF_UP) == 0) {
NG_FREE_M(m); NG_FREE_M(m);
return (ENETDOWN); return (ENETDOWN);

4
sys/netgraph/ng_rfc1490.c
View File

@ -316,8 +316,8 @@ ng_rfc1490_rcvdata(hook_p hook, item_p item)
const u_char *start; const u_char *start;
const u_char *ptr; const u_char *ptr;
if (!m || (m->m_len < MAX_ENCAPS_HDR if (m->m_len < MAX_ENCAPS_HDR
&& !(m = m_pullup(m, MAX_ENCAPS_HDR)))) && !(m = m_pullup(m, MAX_ENCAPS_HDR)))
ERROUT(ENOBUFS); ERROUT(ENOBUFS);
ptr = start = mtod(m, const u_char *); ptr = start = mtod(m, const u_char *);

2
sys/netgraph/ng_sppp.c
View File

@ -382,8 +382,6 @@ ng_sppp_rcvdata (hook_p hook, item_p item)
NG_FREE_ITEM (item); NG_FREE_ITEM (item);
/* Sanity checks */ /* Sanity checks */
KASSERT (m->m_flags & M_PKTHDR, ("%s: not pkthdr", __func__)); KASSERT (m->m_flags & M_PKTHDR, ("%s: not pkthdr", __func__));
if (m == NULL)
return (EINVAL);
if ((pp->pp_if.if_flags & IFF_UP) == 0) { if ((pp->pp_if.if_flags & IFF_UP) == 0) {
NG_FREE_M (m); NG_FREE_M (m);
return (ENETDOWN); return (ENETDOWN);