From 064a3e46b923d6019afc6fa1adb45b82c88c9a65 Mon Sep 17 00:00:00 2001 From: bo yang Date: Fri, 9 Nov 2007 04:28:47 -0500 Subject: [PATCH] --- yaml --- r: 77021 b: refs/heads/master c: b10c36a57552f03582c0ab3ece04f3cce791922d h: refs/heads/master i: 77019: c15eddbfd7319490201f36c90b4313852ab97a0c v: v3 --- [refs] | 2 +- trunk/drivers/scsi/megaraid/megaraid_sas.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9163ebffa520..b4217f3d11fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14faea9f7fe1e8805629b50cf14a65a85fe4a4fd +refs/heads/master: b10c36a57552f03582c0ab3ece04f3cce791922d diff --git a/trunk/drivers/scsi/megaraid/megaraid_sas.c b/trunk/drivers/scsi/megaraid/megaraid_sas.c index 7eefbe0681d6..a58ad61aa36a 100644 --- a/trunk/drivers/scsi/megaraid/megaraid_sas.c +++ b/trunk/drivers/scsi/megaraid/megaraid_sas.c @@ -2825,6 +2825,7 @@ 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)); @@ -2929,14 +2930,16 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance, */ if (ioc->sense_len) { /* - * sense_ptr points to the location that has the user + * sense_buff points to the location that has the user * sense buffer address */ - sense_ptr = (u32 *) ((unsigned long)ioc->frame.raw + - ioc->sense_off); + sense_buff = (unsigned long *) ((unsigned long)ioc->frame.raw + + ioc->sense_off); - if (copy_to_user((void __user *)((unsigned long)(*sense_ptr)), - sense, ioc->sense_len)) { + if (copy_to_user((void __user *)(unsigned long)(*sense_buff), + sense, ioc->sense_len)) { + printk(KERN_ERR "megasas: Failed to copy out to user " + "sense data\n"); error = -EFAULT; goto out; }