FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-08 18:42:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

megaraid_sas: Fix SMAP issue

Browse Source 
Inside compat IOCTL hook of driver, driver was using wrong address of
ioc->frame.raw which leads sense_ioc_ptr to be calculated wrongly and
failing IOCTL.

Signed-off-by: Sumit Saxena <sumit.saxena@avagotech.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Sumit Saxena 2016-01-28 21:14:26 +05:30 committed by Martin K. Petersen
parent 8f67c8c518
commit ea1c928bb6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/scsi/megaraid/megaraid_sas_base.c
View File

@ -6843,9 +6843,9 @@ static int megasas_mgmt_compat_ioctl_fw(struct file *file, unsigned long arg)
int i; int i;
int error = 0; int error = 0;
compat_uptr_t ptr; compat_uptr_t ptr;
unsigned long local_raw_ptr;
u32 local_sense_off; u32 local_sense_off;
u32 local_sense_len; u32 local_sense_len;
u32 user_sense_off;
if (clear_user(ioc, sizeof(*ioc))) if (clear_user(ioc, sizeof(*ioc)))
return -EFAULT; return -EFAULT;
@ -6863,17 +6863,16 @@ static int megasas_mgmt_compat_ioctl_fw(struct file *file, unsigned long arg)
* sense_len is not null, so prepare the 64bit value under * sense_len is not null, so prepare the 64bit value under
* the same condition. * the same condition.
*/ */
if (get_user(local_raw_ptr, ioc->frame.raw) || if (get_user(local_sense_off, &ioc->sense_off) ||
get_user(local_sense_off, &ioc->sense_off) || get_user(local_sense_len, &ioc->sense_len) ||
get_user(local_sense_len, &ioc->sense_len)) get_user(user_sense_off, &cioc->sense_off))
return -EFAULT; return -EFAULT;
if (local_sense_len) { if (local_sense_len) {
void __user **sense_ioc_ptr = void __user **sense_ioc_ptr =
(void __user **)((u8*)local_raw_ptr + local_sense_off); (void __user **)((u8 *)((unsigned long)&ioc->frame.raw) + local_sense_off);
compat_uptr_t *sense_cioc_ptr = compat_uptr_t *sense_cioc_ptr =
(compat_uptr_t *)(cioc->frame.raw + cioc->sense_off); (compat_uptr_t *)(((unsigned long)&cioc->frame.raw) + user_sense_off);
if (get_user(ptr, sense_cioc_ptr) || if (get_user(ptr, sense_cioc_ptr) ||
put_user(compat_ptr(ptr), sense_ioc_ptr)) put_user(compat_ptr(ptr), sense_ioc_ptr))
return -EFAULT; return -EFAULT;