diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2015-02-27 03:54:13 -0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:30 +0100 |
| commit | bf21de36006d41407c179164387984374b846943 (patch) | |
| tree | bd90b84adcb1ee90b2956f24a52a4c4fc9cd58df | |
| parent | 6c3077af21b51bac1670e90704946ded71a34ce4 (diff) | |
| download | kernel_samsung_smdk4412-bf21de36006d41407c179164387984374b846943.zip kernel_samsung_smdk4412-bf21de36006d41407c179164387984374b846943.tar.gz kernel_samsung_smdk4412-bf21de36006d41407c179164387984374b846943.tar.bz2 | |
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: Ben Hutchings <ben@decadent.org.uk>
| -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 e813227..ebf9b60 100644 --- a/drivers/target/target_core_pscsi.c +++ b/drivers/target/target_core_pscsi.c @@ -1168,7 +1168,7 @@ static u32 pscsi_get_device_type(struct se_device *dev) struct pscsi_dev_virt *pdv = dev->dev_ptr; 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) |