lkml.org 
[lkml]   [2015]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 137/156] target/pscsi: Fix NULL pointer dereference in get_device_type
    Date
    3.13.11-ckt19 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Nicholas Bellinger <nab@linux-iscsi.org>

    commit 215a8fe4198f607f34ecdbc9969dae783d8b5a61 upstream.

    This patch fixes a NULL pointer dereference OOPs with pSCSI backends
    within target_core_stat.c code. The bug is caused by a configfs attr
    read if no pscsi_dev_virt->pdv_sd has been configured.

    Reported-by: Olaf Hering <olaf@aepfle.de>
    Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/target/target_core_pscsi.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
    index 0f199f6..29f2880 100644
    --- a/drivers/target/target_core_pscsi.c
    +++ b/drivers/target/target_core_pscsi.c
    @@ -1111,7 +1111,7 @@ static u32 pscsi_get_device_type(struct se_device *dev)
    struct pscsi_dev_virt *pdv = PSCSI_DEV(dev);
    struct scsi_device *sd = pdv->pdv_sd;

    - return sd->type;
    + return (sd) ? sd->type : TYPE_NO_LUN;
    }

    static sector_t pscsi_get_blocks(struct se_device *dev)
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-04-08 01:41    [W:4.041 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site