diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2015-02-27 03:54:13 -0800 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-09 13:14:21 +0200 |
commit | d8e7312770e7f9b540a362bc029d5d77fbe40520 (patch) | |
tree | 07087fe7fed39722efa077c8a84db50887481ed2 | |
parent | 2ddc09fbd0e4fc6dec0b24c7e1978043a67933e1 (diff) | |
download | lwn-d8e7312770e7f9b540a362bc029d5d77fbe40520.tar.gz lwn-d8e7312770e7f9b540a362bc029d5d77fbe40520.zip |
target/pscsi: Fix NULL pointer dereference in get_device_type
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: Jiri Slaby <jslaby@suse.cz>
-rw-r--r-- | drivers/target/target_core_pscsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c index 0f199f6a0738..29f28808fc03 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) |