lkml.org 
[lkml]   [2012]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 4/6] floppy: properly handle failure on add_disk loop
    Date
    On do_floppy_init, if something failed inside the loop we call add_disk,
    there was no cleanup of previous iterations in the error handling.

    Cc: stable@vger.kernel.org
    Acked-by: Vivek Goyal <vgoyal@redhat.com>
    Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    drivers/block/floppy.c | 10 +++++++++-
    1 file changed, 9 insertions(+), 1 deletion(-)

    diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
    index 9272203..3eafe93 100644
    --- a/drivers/block/floppy.c
    +++ b/drivers/block/floppy.c
    @@ -4294,7 +4294,7 @@ static int __init do_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);
    @@ -4313,6 +4313,14 @@ static int __init do_floppy_init(void)

    out_unreg_platform_dev:
    platform_device_unregister(&floppy_device[drive]);
    +out_remove_drives:
    + while (drive--) {
    + if (disk_registered[drive]) {
    + 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-08-13 21:03    [W:3.465 / U:0.612 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site