From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
Jiri Slaby <jirislaby@gmail.com>,
Jens Axboe <jens.axboe@oracle.com>
Subject: [patch 5/8] floppy: fix lock imbalance
Date: Fri, 17 Jul 2009 13:37:23 -0700 [thread overview]
Message-ID: <20090717203824.651982629@mini.kroah.org> (raw)
In-Reply-To: <20090717203935.GA5641@kroah.com>
[-- Attachment #1: floppy-fix-lock-imbalance.patch --]
[-- Type: text/plain, Size: 1079 bytes --]
2.6.27-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jiri Slaby <jirislaby@gmail.com>
commit 8516a500029890a72622d245f8ed32c4e30969b7 upstream.
A crappy macro prevents us unlocking on a fail path.
Expand the macro and unlock appropriatelly.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/block/floppy.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3320,7 +3320,10 @@ static inline int set_geometry(unsigned
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
mutex_lock(&open_lock);
- LOCK_FDC(drive, 1);
+ if (lock_fdc(drive, 1)) {
+ mutex_unlock(&open_lock);
+ return -EINTR;
+ }
floppy_type[type] = *g;
floppy_type[type].name = "user format";
for (cnt = type << 2; cnt < (type << 2) + 4; cnt++)
next prev parent reply other threads:[~2009-07-17 20:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20090717203718.637372453@mini.kroah.org>
2009-07-17 20:39 ` [patch 0/8] 2.6.27.27-stable review Greg KH
2009-07-17 20:37 ` [patch 1/8] Add -fno-delete-null-pointer-checks to gcc CFLAGS Greg KH
2009-07-17 20:37 ` [patch 2/8] personality: fix PER_CLEAR_ON_SETID (CVE-2009-1895) Greg KH
2009-07-17 20:37 ` [patch 3/8] security: use mmap_min_addr indepedently of security models Greg KH
2009-07-17 20:37 ` [patch 4/8] Fix iommu address space allocation Greg KH
2009-07-17 20:37 ` Greg KH [this message]
2009-07-17 20:37 ` [patch 6/8] kernel/resource.c: fix sign extension in reserve_setup() Greg KH
2009-07-17 20:37 ` [patch 7/8] tulip: Fix for MTU problems with 802.1q tagged frames Greg KH
2009-07-17 20:37 ` [patch 8/8] Dont use -fwrapv compiler option: its buggy in gcc-4.1.x Greg KH
[not found] ` <200907180329.34323.arekm@maven.pl>
2009-07-20 3:48 ` [patch 0/8] 2.6.27.27-stable review Greg KH
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=20090717203824.651982629@mini.kroah.org \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=jens.axboe@oracle.com \
--cc=jirislaby@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
/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