Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b70a41e0 authored by bo yang's avatar bo yang Committed by James Bottomley
Browse files

[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: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent ccde6b8d

drivers/scsi/megaraid/megaraid_sas.c

+5 −6
Original line number Diff line number Diff line
@@ -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,13 +3013,13 @@ 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 +

		sense_ptr = (u32 *) ((unsigned long)ioc->frame.raw +

				     ioc->sense_off);



		if (copy_to_user((void __user *)(unsigned long)(*sense_buff),

		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");