system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-18 22:33:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure that we free the passed in data message if we don't actually

Browse source 
insert it onto the queue.  Also, fix a mtx leak if someone turns off
devctl while we're processing a messages.

MFC after:	5 days
This commit is contained in:
Warner Losh 2010-04-20 20:39:42 +00:00
parent bd34cda61a
commit e8b93e4257
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=206916
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sys/kern/subr_bus.c
View file

@ -545,15 +545,16 @@ devctl_queue_data(char *data)
struct proc *p;
if (strlen(data) == 0)
return;
goto out;
if (devctl_queue_length == 0)
return;
goto out;
n1 = malloc(sizeof(*n1), M_BUS, M_NOWAIT);
if (n1 == NULL)
return;
goto out;
n1->dei_data = data;
mtx_lock(&devsoftc.mtx);
if (devctl_queue_length == 0) {
mtx_unlock(&devsoftc.mtx);
free(n1->dei_data, M_BUS);
free(n1, M_BUS);
return;
@ -577,6 +578,14 @@ devctl_queue_data(char *data)
psignal(p, SIGIO);
PROC_UNLOCK(p);
}
return;
out:
/*
* We have to free data on all error paths since the caller
* assumes it will be free'd when this item is dequeued.
*/
free(data, M_BUS);
return;
}
/**