lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 034/136] scsi: sr: Fix sr_probe() missing deallocate of device minor
    Date
    From: Simon Arlott <simon@octiron.net>

    [ Upstream commit 6555781b3fdec5e94e6914511496144241df7dee ]

    If the cdrom fails to be registered then the device minor should be
    deallocated.

    Link: https://lore.kernel.org/r/072dac4b-8402-4de8-36bd-47e7588969cd@0882a8b5-c6c3-11e9-b005-00805fc181fe
    Signed-off-by: Simon Arlott <simon@octiron.net>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/sr.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
    index d0389b20574d0..5be3d6b7991b4 100644
    --- a/drivers/scsi/sr.c
    +++ b/drivers/scsi/sr.c
    @@ -748,7 +748,7 @@ static int sr_probe(struct device *dev)
    cd->cdi.disk = disk;

    if (register_cdrom(&cd->cdi))
    - goto fail_put;
    + goto fail_minor;

    /*
    * Initialize block layer runtime PM stuffs before the
    @@ -766,6 +766,10 @@ static int sr_probe(struct device *dev)

    return 0;

    +fail_minor:
    + spin_lock(&sr_index_lock);
    + clear_bit(minor, sr_index_bits);
    + spin_unlock(&sr_index_lock);
    fail_put:
    put_disk(disk);
    fail_free:
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 22:46    [W:4.188 / U:1.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site