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

MFC r206916

Browse Source 
Make sure that we free the passed in data message if we don't actually
  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-25 19:13:08 +00:00
parent 873ff8abcc
commit 39fc973d89
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;
}
/**