upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't crash the kernel if the user tries to load a netgraph

Browse source 
module with the wrong version number.
This commit is contained in:
Julian Elischer 2001-01-24 21:29:57 +00:00
parent b8627aab72
commit c73b94a276
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sys/netgraph/ng_base.c
View file

@ -1142,11 +1142,11 @@ ng_newtype(struct ng_type *tp)
return (EEXIST);
}
tp->refs = 0;
/* Link in new type */
mtx_enter(&ng_typelist_mtx, MTX_DEF);
LIST_INSERT_HEAD(&ng_typelist, tp, types);
tp->refs = 1; /* first ref is linked list */
mtx_exit(&ng_typelist_mtx, MTX_DEF);
return (0);
}
@ -2678,7 +2678,7 @@ ng_generic_msg(node_p here, item_p item, hook_p lasthook)
break;
}
strncpy(tp->type_name, type->name, NG_TYPELEN);
tp->numnodes = type->refs;
tp->numnodes = type->refs - 1; /* don't count list */
tl->numtypes++;
}
mtx_exit(&ng_typelist_mtx, MTX_DEF);
@ -2909,6 +2909,7 @@ ng_mod_event(module_t mod, int event, void *data)
if (type->mod_event != NULL)
if ((error = (*type->mod_event)(mod, event, data))) {
mtx_enter(&ng_typelist_mtx, MTX_DEF);
type->refs--; /* undo it */
LIST_REMOVE(type, types);
mtx_exit(&ng_typelist_mtx, MTX_DEF);
}
@ -2917,9 +2918,14 @@ ng_mod_event(module_t mod, int event, void *data)
case MOD_UNLOAD:
s = splnet();
if (type->refs != 0) /* make sure no nodes exist! */
if (type->refs > 1) { /* make sure no nodes exist! */
error = EBUSY;
else {
} else {
if (type->refs == 0) {
/* failed load, nothing to undo */
splx(s);
break;
}
if (type->mod_event != NULL) { /* check with type */
error = (*type->mod_event)(mod, event, data);
if (error != 0) { /* type refuses.. */