From: Andrew Morton <akpm@linux-foundation.org>
To: Daniel Walker <dwalker@mvista.com>
Cc: matthias.kaehlcke@gmail.com, linux-kernel@vger.kernel.org,
video4linux-list@redhat.com
Subject: Re: [PATCH -mm] media: video: usbvision: add mutex_unlock() to error paths
Date: Tue, 11 Dec 2007 20:53:12 -0800 [thread overview]
Message-ID: <20071211205312.923551ef.akpm@linux-foundation.org> (raw)
In-Reply-To: <20071212015650.481405953@mvista.com>
On Tue, 11 Dec 2007 17:56:50 -0800 Daniel Walker <dwalker@mvista.com> wrote:
> There are a few error paths which don't unlock the usbvision->lock.
>
> So I've added mutex_unlock() calls to fix those paths.
>
> Signed-off-by: Daniel Walker <dwalker@mvista.com>
>
> ---
> drivers/media/video/usbvision/usbvision-video.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> Index: linux-2.6.23/drivers/media/video/usbvision/usbvision-video.c
> ===================================================================
> --- linux-2.6.23.orig/drivers/media/video/usbvision/usbvision-video.c
> +++ linux-2.6.23/drivers/media/video/usbvision/usbvision-video.c
> @@ -1290,6 +1290,7 @@ static int usbvision_radio_open(struct i
> errCode = usbvision_set_alternate(usbvision);
> if (errCode < 0) {
> usbvision->last_error = errCode;
> + mutex_unlock(&usbvision->lock);
> return -EBUSY;
> }
>
> @@ -1806,6 +1807,7 @@ static int __devinit usbvision_probe(str
> usbvision->num_alt,GFP_KERNEL);
> if (usbvision->alt_max_pkt_size == NULL) {
> err("usbvision: out of memory!\n");
> + mutex_unlock(&usbvision->lock);
> return -ENOMEM;
> }
>
Well yes. But the bug which you've found is a *direct* consequence of a
coding mistake in those functions: they have multiple deeply-nested `return'
statements. This is a common cause of locking errors and resource leaks and
is why we prefer the `goto place-which-unwinds' approach.
We can easily fix that in one case, at least.
One does wonder whether usbvision_radio_open() should be returning the
usbvision_set_alternate() result to the caller here, rather than
overwriting it with -EBUSY.
--- a/drivers/media/video/usbvision/usbvision-video.c~media-video-usbvision-add-mutex_unlock-to-error-paths-fix
+++ a/drivers/media/video/usbvision/usbvision-video.c
@@ -1290,8 +1290,8 @@ static int usbvision_radio_open(struct i
errCode = usbvision_set_alternate(usbvision);
if (errCode < 0) {
usbvision->last_error = errCode;
- mutex_unlock(&usbvision->lock);
- return -EBUSY;
+ errCode = -EBUSY;
+ goto out;
}
// If so far no errors then we shall start the radio
@@ -1308,6 +1308,7 @@ static int usbvision_radio_open(struct i
usbvision->initialized = 0;
}
}
+out:
mutex_unlock(&usbvision->lock);
return errCode;
}
_
prev parent reply other threads:[~2007-12-12 4:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20071212015450.732327355@mvista.com>
2007-12-12 1:56 ` [PATCH -mm] media: video: usbvision: add mutex_unlock() to error paths Daniel Walker
2007-12-12 4:53 ` Andrew Morton [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071211205312.923551ef.akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=dwalker@mvista.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matthias.kaehlcke@gmail.com \
--cc=video4linux-list@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).