evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[S390] fs3270: add missing compat ptr conversion

Browse source 
Add missing compat ptr conversion including two additional
whitespace changes that aren't worth a separate patch.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens 2010-01-13 20:44:32 +01:00 • committed by Martin Schwidefsky
parent 8f3eabe383
commit 16e1a57769
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/s390/char/fs3270.c
View file

@ -15,6 +15,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <asm/compat.h>
#include <asm/ccwdev.h> #include <asm/ccwdev.h>
#include <asm/cio.h> #include <asm/cio.h>
#include <asm/ebcdic.h> #include <asm/ebcdic.h>
@ -322,6 +323,7 @@ fs3270_write(struct file *filp, const char __user *data, size_t count, loff_t *o
static long static long
fs3270_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) fs3270_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{ {
char __user *argp;
struct fs3270 *fp; struct fs3270 *fp;
struct raw3270_iocb iocb; struct raw3270_iocb iocb;
int rc; int rc;
@ -329,6 +331,10 @@ fs3270_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
fp = filp->private_data; fp = filp->private_data;
if (!fp) if (!fp)
return -ENODEV; return -ENODEV;
if (is_compat_task())
argp = compat_ptr(arg);
else
argp = (char __user *)arg;
rc = 0; rc = 0;
mutex_lock(&fs3270_mutex); mutex_lock(&fs3270_mutex);
switch (cmd) { switch (cmd) {
@ -339,10 +345,10 @@ fs3270_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
fp->write_command = arg; fp->write_command = arg;
break; break;
case TUBGETI: case TUBGETI:
rc = put_user(fp->read_command, (char __user *) arg); rc = put_user(fp->read_command, argp);
break; break;
case TUBGETO: case TUBGETO:
rc = put_user(fp->write_command,(char __user *) arg); rc = put_user(fp->write_command, argp);
break; break;
case TUBGETMOD: case TUBGETMOD:
iocb.model = fp->view.model; iocb.model = fp->view.model;
@ -351,8 +357,7 @@ fs3270_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
iocb.pf_cnt = 24; iocb.pf_cnt = 24;
iocb.re_cnt = 20; iocb.re_cnt = 20;
iocb.map = 0; iocb.map = 0;
if (copy_to_user((char __user *) arg, &iocb, if (copy_to_user(argp, &iocb, sizeof(struct raw3270_iocb)))
sizeof(struct raw3270_iocb)))
rc = -EFAULT; rc = -EFAULT;
break; break;
} }
@ -511,8 +516,8 @@ static const struct file_operations fs3270_fops = {
.write = fs3270_write, /* write */ .write = fs3270_write, /* write */
.unlocked_ioctl = fs3270_ioctl, /* ioctl */ .unlocked_ioctl = fs3270_ioctl, /* ioctl */
.compat_ioctl = fs3270_ioctl, /* ioctl */ .compat_ioctl = fs3270_ioctl, /* ioctl */
.open = fs3270_open, /* open */ .open = fs3270_open, /* open */
.release = fs3270_close, /* release */ .release = fs3270_close, /* release */
}; };
/* /*