lkml.org 
[lkml]   [2012]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 020/241] floppy: properly handle failure on add_disk loop
    Date
    3.5.7.2 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>

    commit d60e7ec18c3fb2cbf90969ccd42889eb2d03aef9 upstream.

    On floppy initialization, if something failed inside the loop we call
    add_disk, there was no cleanup of previous iterations in the error
    handling.

    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    drivers/block/floppy.c | 11 ++++++++++-
    1 file changed, 10 insertions(+), 1 deletion(-)

    diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
    index 889f47e..7ad2489 100644
    --- a/drivers/block/floppy.c
    +++ b/drivers/block/floppy.c
    @@ -4293,7 +4293,7 @@ static int __init floppy_init(void)

    err = platform_device_register(&floppy_device[drive]);
    if (err)
    - goto out_release_dma;
    + goto out_remove_drives;

    err = device_create_file(&floppy_device[drive].dev,
    &dev_attr_cmos);
    @@ -4311,6 +4311,15 @@ static int __init floppy_init(void)

    out_unreg_platform_dev:
    platform_device_unregister(&floppy_device[drive]);
    +out_remove_drives:
    + while (drive--) {
    + if ((allowed_drive_mask & (1 << drive)) &&
    + fdc_state[FDC(drive)].version != FDC_NONE) {
    + del_gendisk(disks[drive]);
    + device_remove_file(&floppy_device[drive].dev, &dev_attr_cmos);
    + platform_device_unregister(&floppy_device[drive]);
    + }
    + }
    out_release_dma:
    if (atomic_read(&usage_count))
    floppy_release_irq_and_dma();
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-12-13 15:21    [W:2.172 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site