Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

random: Fix mutex use-after-destroy.

Browse Source 
sRandomLock is a driver-global lock used by all instances of the "random"
device, of which there can be more than one, it seems; and somehow some
are destroyed before others. I didn't really investigate too far to see
under what circumstances that occurs.

Found while trying to compile some ports; suddenly all attempted
reads of /dev/random started PANIC'ing with "mutex uninitialized".
This commit is contained in:
Augustin Cavalier 2018-10-30 22:33:42 -04:00
parent 645e6f89ce
commit 84f3356750
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/add-ons/kernel/bus_managers/random/driver.cpp
View File

@ -48,7 +48,6 @@ typedef struct {
static status_t static status_t
random_init_device(void* _info, void** _cookie) random_init_device(void* _info, void** _cookie)
{ {
mutex_init(&sRandomLock, "/dev/random lock");
return B_OK; return B_OK;
} }
@ -56,7 +55,6 @@ random_init_device(void* _info, void** _cookie)
static void static void
random_uninit_device(void* _cookie) random_uninit_device(void* _cookie)
{ {
mutex_destroy(&sRandomLock);
} }
@ -186,6 +184,8 @@ random_init_driver(device_node *node, void **cookie)
if (info == NULL) if (info == NULL)
return B_NO_MEMORY; return B_NO_MEMORY;
mutex_init(&sRandomLock, "/dev/random lock");
memset(info, 0, sizeof(*info)); memset(info, 0, sizeof(*info));
info->node = node; info->node = node;
@ -199,6 +199,9 @@ static void
random_uninit_driver(void *_cookie) random_uninit_driver(void *_cookie)
{ {
CALLED(); CALLED();
mutex_destroy(&sRandomLock);
random_driver_info* info = (random_driver_info*)_cookie; random_driver_info* info = (random_driver_info*)_cookie;
free(info); free(info);
} }