diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2010-01-13 17:52:38 +0100 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-01-17 12:38:49 -0600 |
| commit | 9e2ab1fabdbd88669fdebd368fb5cda32ad5438d (patch) | |
| tree | 8707b3baccb3814cc8038423157758930e3e06b3 /drivers/s390/scsi | |
| parent | 5a3fb3081a0166cdc5df0d9200234d09ad8d6083 (diff) | |
| download | talos-op-linux-9e2ab1fabdbd88669fdebd368fb5cda32ad5438d.tar.gz talos-op-linux-9e2ab1fabdbd88669fdebd368fb5cda32ad5438d.zip | |
[SCSI] zfcp: add missing compat ptr conversion
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/s390/scsi')
| -rw-r--r-- | drivers/s390/scsi/zfcp_cfdc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/s390/scsi/zfcp_cfdc.c b/drivers/s390/scsi/zfcp_cfdc.c index f932400e980a..0eb6eefd2c1a 100644 --- a/drivers/s390/scsi/zfcp_cfdc.c +++ b/drivers/s390/scsi/zfcp_cfdc.c @@ -12,6 +12,7 @@ #include <linux/types.h> #include <linux/miscdevice.h> +#include <asm/compat.h> #include <asm/ccwdev.h> #include "zfcp_def.h" #include "zfcp_ext.h" @@ -163,7 +164,7 @@ static void zfcp_cfdc_req_to_sense(struct zfcp_cfdc_data *data, } static long zfcp_cfdc_dev_ioctl(struct file *file, unsigned int command, - unsigned long buffer) + unsigned long arg) { struct zfcp_cfdc_data *data; struct zfcp_cfdc_data __user *data_user; @@ -175,7 +176,11 @@ static long zfcp_cfdc_dev_ioctl(struct file *file, unsigned int command, if (command != ZFCP_CFDC_IOC) return -ENOTTY; - data_user = (void __user *) buffer; + if (is_compat_task()) + data_user = compat_ptr(arg); + else + data_user = (void __user *)arg; + if (!data_user) return -EINVAL; |
