diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-11-18 01:59:48 (GMT) |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-02-19 19:39:36 (GMT) |
| commit | 756f173fb5fa90ec15222e80fb579288be7794fd (patch) | |
| tree | 83633164ff4b8fb20c2fb383429905e25ceed1fc | |
| parent | 735f7d2fedf57380214221be7bed7f62d729e262 (diff) | |
| download | linux-fsl-qoriq-756f173fb5fa90ec15222e80fb579288be7794fd.tar.xz | |
[SCSI] libsas: fix leak of dev->sata_dev.identify_[packet_]device
These are never freed in the nominal path. A domain_device has a
different lifetime than a sas_rphy we need a dev->rphy independent way
of identifying sata devices.
Reviewed-by: Jack Wang <jack_wang@usish.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
| -rw-r--r-- | drivers/scsi/libsas/sas_discover.c | 6 | ||||
| -rw-r--r-- | include/scsi/sas_ata.h | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c index 4e64930..dc52b1f 100644 --- a/drivers/scsi/libsas/sas_discover.c +++ b/drivers/scsi/libsas/sas_discover.c @@ -30,6 +30,7 @@ #include <scsi/scsi_transport.h> #include <scsi/scsi_transport_sas.h> +#include <scsi/sas_ata.h> #include "../scsi_sas_internal.h" /* ---------- Basic task processing for discovery purposes ---------- */ @@ -231,6 +232,11 @@ void sas_free_device(struct kref *kref) if (dev->dev_type == EDGE_DEV || dev->dev_type == FANOUT_DEV) kfree(dev->ex_dev.ex_phy); + if (dev_is_sata(dev)) { + kfree(dev->sata_dev.identify_device); + kfree(dev->sata_dev.identify_packet_device); + } + kfree(dev); } diff --git a/include/scsi/sas_ata.h b/include/scsi/sas_ata.h index 9c159f7..7d5013f 100644 --- a/include/scsi/sas_ata.h +++ b/include/scsi/sas_ata.h @@ -32,7 +32,8 @@ static inline int dev_is_sata(struct domain_device *dev) { - return (dev->rphy->identify.target_port_protocols & SAS_PROTOCOL_SATA); + return dev->dev_type == SATA_DEV || dev->dev_type == SATA_PM || + dev->dev_type == SATA_PM_PORT; } int sas_ata_init_host_and_port(struct domain_device *found_dev, |