Commit 62c4da44 authored Jun 25, 2014 by Joe Lawrence Committed by Christoph Hellwig Jul 25, 2014

mpt3sas: correct scsi_{target,device} hostdata allocation



In _scsih_{slave,target}_alloc, an incorrect structure type is passed
to sizeof() when allocating storage for hostdata.  Luckily larger
structure types were used, so at least the wrong sizes were safe:

  struct scsi_device (1784 bytes) > struct MPT3SAS_DEVICE (24 bytes)
  struct scsi_target (760 bytes)  > struct MPT3SAS_TARGET (32 bytes)

This fixes the following smatch warnings:

  drivers/scsi/mpt3sas/mpt3sas_scsih.c:1166 _scsih_target_alloc()
    warn: struct type mismatch 'MPT3SAS_TARGET vs scsi_target'

  drivers/scsi/mpt3sas/mpt3sas_scsih.c:1280 _scsih_slave_alloc()
    warn: struct type mismatch 'MPT3SAS_DEVICE vs scsi_device'

Signed-off-by: Joe Lawrence <joe.lawrence@stratus.com>
Acked-by: Sreekanth Reddy <Sreekanth.Reddy@avagotech.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

parent 42de597e

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1163,7 +1163,8 @@ _scsih_target_alloc(struct scsi_target *starget)
		unsigned long flags;
		struct sas_rphy *rphy;

		sas_target_priv_data = kzalloc(sizeof(struct scsi_target), GFP_KERNEL);
		sas_target_priv_data = kzalloc(sizeof(*sas_target_priv_data),
		GFP_KERNEL);
		if (!sas_target_priv_data)
		return -ENOMEM;

		@@ -1277,7 +1278,8 @@ _scsih_slave_alloc(struct scsi_device *sdev)
		struct _sas_device *sas_device;
		unsigned long flags;

		sas_device_priv_data = kzalloc(sizeof(struct scsi_device), GFP_KERNEL);
		sas_device_priv_data = kzalloc(sizeof(*sas_device_priv_data),
		GFP_KERNEL);
		if (!sas_device_priv_data)
		return -ENOMEM;