upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 08:43:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only hold the mutex for an eventhandler list while the list is being accessed.

Browse source 
Specifically, don't hold the lock while calling event handlers as a handler
may tsleep() while holding the mutex.

Found by:	witness
This commit is contained in:
John Baldwin 2000-11-14 18:22:59 +00:00
parent b3b01ff362
commit 8204c68ecc
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/sys/eventhandler.h
View file

@ -81,14 +81,14 @@ do { \
struct eventhandler_entry *_en; \
\
if (_el->el_flags & EHE_INITTED) { \
mtx_enter(&_el->el_mutex, MTX_DEF); \
while (_ep != NULL) { \
mtx_enter(&_el->el_mutex, MTX_DEF); \
_en = TAILQ_NEXT(_ep, ee_link); \
mtx_exit(&_el->el_mutex, MTX_DEF); \
((struct eventhandler_entry_ ## name *)_ep)->eh_func(_ep->ee_arg , \
## args); \
_ep = _en; \
} \
mtx_exit(&_el->el_mutex, MTX_DEF); \
} \
} while (0)
@ -122,13 +122,15 @@ do { \
(_el->el_flags & EHE_INITTED)) { \
mtx_enter(&_el->el_mutex, MTX_DEF); \
_ep = TAILQ_FIRST(&(_el->el_entries)); \
mtx_exit(&_el->el_mutex, MTX_DEF); \
while (_ep != NULL) { \
mtx_enter(&_el->el_mutex, MTX_DEF); \
_en = TAILQ_NEXT(_ep, ee_link); \
mtx_exit(&_el->el_mutex, MTX_DEF); \
((struct eventhandler_entry_ ## name *)_ep)->eh_func(_ep->ee_arg , \
## args); \
_ep = _en; \
} \
mtx_exit(&_el->el_mutex, MTX_DEF); \
} \
} while (0)