lkml.org 
[lkml]   [2009]   [Jul]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 5/8] floppy: fix lock imbalance
    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++)



    \
     
     \ /
      Last update: 2009-07-17 22:45    [W:0.033 / U:28.940 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site