Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755309AbXI1UX4 (ORCPT ); Fri, 28 Sep 2007 16:23:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752468AbXI1UXs (ORCPT ); Fri, 28 Sep 2007 16:23:48 -0400 Received: from mail0.lsil.com ([147.145.40.20]:52035 "EHLO mail0.lsil.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752157AbXI1UXr (ORCPT ); Fri, 28 Sep 2007 16:23:47 -0400 Subject: [PATCH 5/8] scsi: megaraid_sas - using unsigned long for sense_buff ptr From: bo yang To: linux-scsi@vger.kernel.org Cc: James.Bottomley@SteelEye.com, akpm@osdl.org, linux-kernel@vger.kernel.org, Bo.yang@lsi.com, Sumant.patro@lsi.com Content-Type: text/plain Content-Transfer-Encoding: 7bit Date: Wed, 26 Sep 2007 11:41:07 -0400 Message-Id: <1190821267.5955.20.camel@dhcp-75-534.se.lsil.com> Mime-Version: 1.0 X-Mailer: Evolution 2.0.2 (2.0.2-35.el4) X-OriginalArrivalTime: 28 Sep 2007 20:23:33.0751 (UTC) FILETIME=[7139E870:01C8020D] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1726 Lines: 47 MegaRAID utilities expect sense_buff to be of type unsigned long. Signed-off-by: Bo Yang --- drivers/scsi/megaraid/megaraid_sas.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff -uprN linux-2.6.22_orig/drivers/scsi/megaraid/megaraid_sas.c linux-2.6.22_new/drivers/scsi/megaraid/megaraid_sas.c --- linux-2.6.22_orig/drivers/scsi/megaraid/megaraid_sas.c 2007-09-27 04:41:39.000000000 -0700 +++ linux-2.6.22_new/drivers/scsi/megaraid/megaraid_sas.c 2007-09-27 04:50:14.000000000 -0700 @@ -2969,6 +2969,7 @@ megasas_mgmt_fw_ioctl(struct megasas_ins void *sense = NULL; dma_addr_t sense_handle; u32 *sense_ptr; + unsigned long *sense_buff; memset(kbuff_arr, 0, sizeof(kbuff_arr)); @@ -3073,14 +3074,16 @@ megasas_mgmt_fw_ioctl(struct megasas_ins */ 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; } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/