Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753804AbXKIVXp (ORCPT ); Fri, 9 Nov 2007 16:23:45 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754550AbXKIVXW (ORCPT ); Fri, 9 Nov 2007 16:23:22 -0500 Received: from mail0.lsil.com ([147.145.40.20]:35661 "EHLO mail0.lsil.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751385AbXKIVXU (ORCPT ); Fri, 9 Nov 2007 16:23:20 -0500 Subject: [PATCH 3/6] 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: Fri, 09 Nov 2007 04:28:47 -0500 Message-Id: <1194600527.6297.4.camel@dhcp-75-884.se.lsil.com> Mime-Version: 1.0 X-Mailer: Evolution 2.0.2 (2.0.2-35.el4) X-OriginalArrivalTime: 09 Nov 2007 21:23:06.0335 (UTC) FILETIME=[B80076F0:01C82316] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1727 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 -rupN 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-11-07 02:28:21.206651976 -0500 +++ linux-2.6.22_new/drivers/scsi/megaraid/megaraid_sas.c 2007-11-07 02:29:11.219048936 -0500 @@ -2824,6 +2824,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)); @@ -2928,14 +2929,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/