[SCSI] megaraid_sas: rollback the sense info implementation
Sense buffer ptr data type in the ioctl path is reverted back to u32 * as in previous versions of driver. Signed-off-by Bo Yang<bo.yang@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Родитель
ccde6b8d62
Коммит
b70a41e077
|
@ -2909,7 +2909,6 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance,
|
|||
void *sense = NULL;
|
||||
dma_addr_t sense_handle;
|
||||
u32 *sense_ptr;
|
||||
unsigned long *sense_buff;
|
||||
|
||||
memset(kbuff_arr, 0, sizeof(kbuff_arr));
|
||||
|
||||
|
@ -3014,14 +3013,14 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance,
|
|||
*/
|
||||
if (ioc->sense_len) {
|
||||
/*
|
||||
* sense_buff points to the location that has the user
|
||||
* sense_ptr points to the location that has the user
|
||||
* sense buffer address
|
||||
*/
|
||||
sense_buff = (unsigned long *) ((unsigned long)ioc->frame.raw +
|
||||
ioc->sense_off);
|
||||
sense_ptr = (u32 *) ((unsigned long)ioc->frame.raw +
|
||||
ioc->sense_off);
|
||||
|
||||
if (copy_to_user((void __user *)(unsigned long)(*sense_buff),
|
||||
sense, ioc->sense_len)) {
|
||||
if (copy_to_user((void __user *)((unsigned long)(*sense_ptr)),
|
||||
sense, ioc->sense_len)) {
|
||||
printk(KERN_ERR "megasas: Failed to copy out to user "
|
||||
"sense data\n");
|
||||
error = -EFAULT;
|
||||
|
|
Загрузка…
Ссылка в новой задаче