Commit 6f4e626f authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Martin K. Petersen
Browse files

scsi: ata: Use unsigned int for cmd's type in ioctls in scsi_host_template 

Clang warns several times in the scsi subsystem (trimmed for brevity):

drivers/scsi/hpsa.c:6209:7: warning: overflow converting case value to
switch condition type (2147762695 to 18446744071562347015) [-Wswitch]
        case CCISS_GETBUSTYPES:
             ^
drivers/scsi/hpsa.c:6208:7: warning: overflow converting case value to
switch condition type (2147762694 to 18446744071562347014) [-Wswitch]
        case CCISS_GETHEARTBEAT:
             ^

The root cause is that the _IOC macro can generate really large numbers,
which don't fit into type 'int', which is used for the cmd parameter in
the ioctls in scsi_host_template. My research into how GCC and Clang are
handling this at a low level didn't prove fruitful. However, looking at
the rest of the kernel tree, all ioctls use an 'unsigned int' for the
cmd parameter, which will fit all of the _IOC values in the scsi/ata
subsystems.

Make that change because none of the ioctls expect a negative value for
any command, it brings the ioctls inline with the reset of the kernel,
and it removes ambiguity, which is never good when dealing with compilers.

Link: https://github.com/ClangBuiltLinux/linux/issues/85
Link: https://github.com/ClangBuiltLinux/linux/issues/154
Link: https://github.com/ClangBuiltLinux/linux/issues/157


Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Acked-by: default avatarBradley Grove <bgrove@attotech.com>
Acked-by: default avatarDon Brace <don.brace@microsemi.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Tested-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 42fb055a

drivers/ata/libata-scsi.c

+3 −2
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ static int ata_ioc32(struct ata_port *ap) 
}



int ata_sas_scsi_ioctl(struct ata_port *ap, struct scsi_device *scsidev,

		     int cmd, void __user *arg)

		     unsigned int cmd, void __user *arg)

{

	unsigned long val;

	int rc = -EINVAL;
@@ -829,7 +829,8 @@ int ata_sas_scsi_ioctl(struct ata_port *ap, struct scsi_device *scsidev, 
}

EXPORT_SYMBOL_GPL(ata_sas_scsi_ioctl);



int ata_scsi_ioctl(struct scsi_device *scsidev, int cmd, void __user *arg)

int ata_scsi_ioctl(struct scsi_device *scsidev, unsigned int cmd,

		   void __user *arg)

{

	return ata_sas_scsi_ioctl(ata_shost_to_port(scsidev->host),

				scsidev, cmd, arg);

drivers/scsi/aacraid/aachba.c

+1 −1
Original line number Diff line number Diff line
@@ -3455,7 +3455,7 @@ static int delete_disk(struct aac_dev *dev, void __user *arg) 
	}

}



int aac_dev_ioctl(struct aac_dev *dev, int cmd, void __user *arg)

int aac_dev_ioctl(struct aac_dev *dev, unsigned int cmd, void __user *arg)

{

	switch (cmd) {

	case FSACTL_QUERY_DISK:

drivers/scsi/aacraid/aacraid.h

+2 −2
Original line number Diff line number Diff line
@@ -2706,12 +2706,12 @@ void aac_set_intx_mode(struct aac_dev *dev); 
int aac_get_config_status(struct aac_dev *dev, int commit_flag);

int aac_get_containers(struct aac_dev *dev);

int aac_scsi_cmd(struct scsi_cmnd *cmd);

int aac_dev_ioctl(struct aac_dev *dev, int cmd, void __user *arg);

int aac_dev_ioctl(struct aac_dev *dev, unsigned int cmd, void __user *arg);

#ifndef shost_to_class

#define shost_to_class(shost) &shost->shost_dev

#endif

ssize_t aac_get_serial_number(struct device *dev, char *buf);

int aac_do_ioctl(struct aac_dev * dev, int cmd, void __user *arg);

int aac_do_ioctl(struct aac_dev *dev, unsigned int cmd, void __user *arg);

int aac_rx_init(struct aac_dev *dev);

int aac_rkt_init(struct aac_dev *dev);

int aac_nark_init(struct aac_dev *dev);

drivers/scsi/aacraid/commctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -1060,7 +1060,7 @@ static int aac_send_reset_adapter(struct aac_dev *dev, void __user *arg) 
	return retval;

}



int aac_do_ioctl(struct aac_dev * dev, int cmd, void __user *arg)

int aac_do_ioctl(struct aac_dev *dev, unsigned int cmd, void __user *arg)

{

	int status;

drivers/scsi/aacraid/linit.c

+4 −2
Original line number Diff line number Diff line
@@ -616,7 +616,8 @@ static struct device_attribute *aac_dev_attrs[] = { 
	NULL,

};



static int aac_ioctl(struct scsi_device *sdev, int cmd, void __user * arg)

static int aac_ioctl(struct scsi_device *sdev, unsigned int cmd,

		     void __user *arg)

{

	struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata;

	if (!capable(CAP_SYS_RAWIO))
@@ -1205,7 +1206,8 @@ static long aac_compat_do_ioctl(struct aac_dev *dev, unsigned cmd, unsigned long 
	return ret;

}



static int aac_compat_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)

static int aac_compat_ioctl(struct scsi_device *sdev, unsigned int cmd,

			    void __user *arg)

{

	struct aac_dev *dev = (struct aac_dev *)sdev->host->hostdata;

	if (!capable(CAP_SYS_RAWIO))

CRA Git | Maintained and supported by SUSTech CRA and CCSE