2013-04-11 06:24:27

by Dan Carpenter

Subject: [patch 1/2 -next] dma-buf: double unlock in debugfs code

We unlock here when we failed to take the lock.

Signed-off-by: Dan Carpenter <[email protected]>
---
This is in linux-next, and I think the debugfs code is only in Sumit's
tree.

diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c
index 466476f..174cd2c 100644
--- a/drivers/base/dma-buf.c
+++ b/drivers/base/dma-buf.c
@@ -593,7 +593,7 @@ static int dma_buf_describe(struct seq_file *s)
if (ret) {
seq_printf(s,
"\tERROR locking buffer object: skipping\n");
- goto skip_buffer;
+ continue;
}

seq_printf(s, "\t");
@@ -618,7 +618,6 @@ static int dma_buf_describe(struct seq_file *s)

count++;
size += buf_obj->size;
-skip_buffer:
mutex_unlock(&buf_obj->lock);
}

2013-04-11 06:27:21

by Dan Carpenter

Subject: Re: [kbuild] [patch 1/2 -next] dma-buf: double unlock in debugfs code

Oops... I mailed that prematurely. There isn't a [patch 2/2].

regards,
dan carpenter

2013-04-11 19:41:01

by Greg KH

Subject: Re: [patch 1/2 -next] dma-buf: double unlock in debugfs code

On Thu, Apr 11, 2013 at 09:23:39AM +0300, Dan Carpenter wrote:
> We unlock here when we failed to take the lock.
>
> Signed-off-by: Dan Carpenter <[email protected]>
> ---
> This is in linux-next, and I think the debugfs code is only in Sumit's
> tree.

Yes, it's not in mine, so I can't take this, sorry. Sumit, please apply
this:

Acked-by: Greg Kroah-Hartman <[email protected]>

2013-04-12 05:59:57

by Dan Carpenter

Subject: Re: [patch 1/2 -next] dma-buf: double unlock in debugfs code

On Fri, Apr 12, 2013 at 08:43:05AM +0530, Sumit Semwal wrote:
> Hi Dan,
>
> On Apr 11, 2013 11:54 AM, "Dan Carpenter" <[email protected]> wrote:
> >
> > We unlock here when we failed to take the lock.
> Thanks for catching this; I will add it to the for-next queue.
>
> Could I merge this change with the main patch while submitting to mainline?
> With an attribution to you, of course.

Yeah. Just merge it. Don't stress about attribution.

regards,
dan carpenter