diff options
| author | imp <imp@FreeBSD.org> | 2010-04-20 20:39:42 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-04-20 20:39:42 +0000 |
| commit | f6c103ea8b2ebb3077decb02ca42bbd8c5d2def6 (patch) | |
| tree | 5e6dd2510dd929903716537da00729c723b8b360 /sys/kern | |
| parent | 2797285648d17e42b27aa8747a0f5b4eb6632eb6 (diff) | |
| download | FreeBSD-src-f6c103ea8b2ebb3077decb02ca42bbd8c5d2def6.zip FreeBSD-src-f6c103ea8b2ebb3077decb02ca42bbd8c5d2def6.tar.gz | |
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
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_bus.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 6e939c0..9d3292a 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -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; } /** |
