Commit 7b2519af authored by Yang, Bo's avatar Yang, Bo Committed by James Bottomley

[SCSI] megaraid_sas: fix 64 bit sense pointer truncation

The current sense pointer is cast to a u32 pointer, which can truncate
on 64 bits.  Fix by using unsigned long instead.

Signed-off-by Bo Yang<bo.yang@lsi.com>
Cc: stable@kernel.org
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 7e8a75f4
...@@ -3515,7 +3515,7 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance, ...@@ -3515,7 +3515,7 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance,
int error = 0, i; int error = 0, i;
void *sense = NULL; void *sense = NULL;
dma_addr_t sense_handle; dma_addr_t sense_handle;
u32 *sense_ptr; unsigned long *sense_ptr;
memset(kbuff_arr, 0, sizeof(kbuff_arr)); memset(kbuff_arr, 0, sizeof(kbuff_arr));
...@@ -3593,7 +3593,7 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance, ...@@ -3593,7 +3593,7 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance,
} }
sense_ptr = sense_ptr =
(u32 *) ((unsigned long)cmd->frame + ioc->sense_off); (unsigned long *) ((unsigned long)cmd->frame + ioc->sense_off);
*sense_ptr = sense_handle; *sense_ptr = sense_handle;
} }
...@@ -3624,8 +3624,8 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance, ...@@ -3624,8 +3624,8 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance,
* sense_ptr points to the location that has the user * sense_ptr points to the location that has the user
* sense buffer address * sense buffer address
*/ */
sense_ptr = (u32 *) ((unsigned long)ioc->frame.raw + sense_ptr = (unsigned long *) ((unsigned long)ioc->frame.raw +
ioc->sense_off); ioc->sense_off);
if (copy_to_user((void __user *)((unsigned long)(*sense_ptr)), if (copy_to_user((void __user *)((unsigned long)(*sense_ptr)),
sense, ioc->sense_len)) { sense, ioc->sense_len)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment