[PATCH 1/2] staging: iio: Ensure mutex is correctly unlocked in __iio_push_event

From: Jonathan Cameron
Date: Sat Jan 09 2010 - 11:57:36 EST



Signed-off-by: Jonathan Cameron <jic23@xxxxxxxxx>
---

This error was picked up by running the smatch static
checker over all the IIO subsytem.

Whilst there are some false positives in some of the
drivers, it picked up two real errors in the core. I
was very impressed at the quality of the reporting and
so Dan you can add me to your list of users as I'll be
making frequent use of it in the future!

drivers/staging/iio/industrialio-core.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index 768f448..87799b2 100644
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -79,11 +79,14 @@ EXPORT_SYMBOL(__iio_change_event);
/* Does anyone care? */
mutex_lock(&ev_int->event_list_lock);
if (test_bit(IIO_BUSY_BIT_POS, &ev_int->handler.flags)) {
- if (ev_int->current_events == ev_int->max_events)
+ if (ev_int->current_events == ev_int->max_events) {
+ mutex_unlock(&ev_int->event_list_lock);
return 0;
+ }
ev = kmalloc(sizeof(*ev), GFP_KERNEL);
if (ev == NULL) {
ret = -ENOMEM;
+ mutex_unlock(&ev_int->event_list_lock);
goto error_ret;
}
ev->ev.id = ev_code;
--
1.6.4.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/