git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SCSI] zfcp: add missing compat ptr conversion
[pandora-kernel.git]
/
drivers
/
s390
/
scsi
/
zfcp_cfdc.c
diff --git
a/drivers/s390/scsi/zfcp_cfdc.c
b/drivers/s390/scsi/zfcp_cfdc.c
index
f932400
..
0eb6eef
100644
(file)
--- 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 <linux/types.h>
#include <linux/miscdevice.h>
+#include <asm/compat.h>
#include <asm/ccwdev.h>
#include "zfcp_def.h"
#include "zfcp_ext.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,
}
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;
{
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;
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;
if (!data_user)
return -EINVAL;