Skip to content

Commit

Permalink
[SCSI] megaraid_sas: fix 64 bit sense pointer truncation
Browse files Browse the repository at this point in the history
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: James Bottomley <James.Bottomley@suse.de>
  • Loading branch information
Yang, Bo authored and James Bottomley committed Oct 29, 2009
1 parent 7e8a75f commit 7b2519a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/scsi/megaraid/megaraid_sas.c
Original file line number Diff line number Diff line change
Expand Up @@ -3515,7 +3515,7 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance,
int error = 0, i;
void *sense = NULL;
dma_addr_t sense_handle;
u32 *sense_ptr;
unsigned long *sense_ptr;

memset(kbuff_arr, 0, sizeof(kbuff_arr));

Expand Down Expand Up @@ -3593,7 +3593,7 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance,
}

sense_ptr =
(u32 *) ((unsigned long)cmd->frame + ioc->sense_off);
(unsigned long *) ((unsigned long)cmd->frame + ioc->sense_off);
*sense_ptr = sense_handle;
}

Expand Down Expand Up @@ -3624,8 +3624,8 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance,
* sense_ptr points to the location that has the user
* sense buffer address
*/
sense_ptr = (u32 *) ((unsigned long)ioc->frame.raw +
ioc->sense_off);
sense_ptr = (unsigned long *) ((unsigned long)ioc->frame.raw +
ioc->sense_off);

if (copy_to_user((void __user *)((unsigned long)(*sense_ptr)),
sense, ioc->sense_len)) {
Expand Down

0 comments on commit 7b2519a

Please sign in to comment.