2009-01-17 11:05:19

by Jiri Slaby

Subject: [PATCH 1/1] relay: fix lock imbalance in relay_late_setup_files

One fail path in relay_late_setup_files() omits
mutex_unlock(&relay_channels_mutex);
Add it.

Signed-off-by: Jiri Slaby <[email protected]>
Cc: Eduard - Gabriel Munteanu <[email protected]>
Cc: Jens Axboe <[email protected]>
---
kernel/relay.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/kernel/relay.c b/kernel/relay.c
index 8ca1587..738bc85 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -714,8 +714,10 @@ int relay_late_setup_files(struct rchan *chan,

mutex_lock(&relay_channels_mutex);
/* Is chan already set up? */
- if (unlikely(chan->has_base_filename))
+ if (unlikely(chan->has_base_filename)) {
+ mutex_unlock(&relay_channels_mutex);
return -EEXIST;
+ }
chan->has_base_filename = 1;
chan->parent = parent;
curr_cpu = get_cpu();
--
1.6.1
caught by stanse

2009-01-17 19:47:33

by Eduard - Gabriel Munteanu

Subject: Re: [PATCH 1/1] relay: fix lock imbalance in relay_late_setup_files

On Sat, Jan 17, 2009 at 12:04:36PM +0100, Jiri Slaby wrote:
> One fail path in relay_late_setup_files() omits
> mutex_unlock(&relay_channels_mutex);
> Add it.
>
> Signed-off-by: Jiri Slaby <[email protected]>
> Cc: Eduard - Gabriel Munteanu <[email protected]>
> Cc: Jens Axboe <[email protected]>

Oh, I missed that. Looks good to me.


Thanks,
Eduard

2009-01-19 10:16:48

by Jens Axboe

Subject: Re: [PATCH 1/1] relay: fix lock imbalance in relay_late_setup_files

On Sat, Jan 17 2009, Jiri Slaby wrote:
> One fail path in relay_late_setup_files() omits
> mutex_unlock(&relay_channels_mutex);
> Add it.
>
> Signed-off-by: Jiri Slaby <[email protected]>
> Cc: Eduard - Gabriel Munteanu <[email protected]>
> Cc: Jens Axboe <[email protected]>
> ---
> kernel/relay.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)

Looks good, applied!

>
> diff --git a/kernel/relay.c b/kernel/relay.c
> index 8ca1587..738bc85 100644
> --- a/kernel/relay.c
> +++ b/kernel/relay.c
> @@ -714,8 +714,10 @@ int relay_late_setup_files(struct rchan *chan,
>
> mutex_lock(&relay_channels_mutex);
> /* Is chan already set up? */
> - if (unlikely(chan->has_base_filename))
> + if (unlikely(chan->has_base_filename)) {
> + mutex_unlock(&relay_channels_mutex);
> return -EEXIST;
> + }
> chan->has_base_filename = 1;
> chan->parent = parent;
> curr_cpu = get_cpu();
> --
> 1.6.1
> caught by stanse
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

--
Jens Axboe