diff options
author | Stratos Psomadakis <psomas@gentoo.org> | 2011-12-03 19:23:54 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-25 20:24:59 -0500 |
commit | 7b3e8a2073d9875dbdcdfec5d40ff54c8e8c418c (patch) | |
tree | 98daae136eab94cbadb11942ead31162b420d448 | |
parent | 68e6689b9b35c8a2fa73e00947238d2c5cb0387c (diff) |
sym53c8xx: Fix NULL pointer dereference in slave_destroy
commit cced5041ed5a2d1352186510944b0ddfbdbe4c0b upstream.
sym53c8xx_slave_destroy unconditionally assumes that sym53c8xx_slave_alloc has
succesesfully allocated a sym_lcb. This can lead to a NULL pointer dereference
(exposed by commit 4e6c82b).
Signed-off-by: Stratos Psomadakis <psomas@gentoo.org>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_glue.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c index b4543f575f4..36d1ed7817e 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.c +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c | |||
@@ -839,6 +839,10 @@ static void sym53c8xx_slave_destroy(struct scsi_device *sdev) | |||
839 | struct sym_lcb *lp = sym_lp(tp, sdev->lun); | 839 | struct sym_lcb *lp = sym_lp(tp, sdev->lun); |
840 | unsigned long flags; | 840 | unsigned long flags; |
841 | 841 | ||
842 | /* if slave_alloc returned before allocating a sym_lcb, return */ | ||
843 | if (!lp) | ||
844 | return; | ||
845 | |||
842 | spin_lock_irqsave(np->s.host->host_lock, flags); | 846 | spin_lock_irqsave(np->s.host->host_lock, flags); |
843 | 847 | ||
844 | if (lp->busy_itlq || lp->busy_itl) { | 848 | if (lp->busy_itlq || lp->busy_itl) { |