Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16e1a577 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] fs3270: add missing compat ptr conversion 



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

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 8f3eabe3

drivers/s390/char/fs3270.c

+11 −6
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/types.h>

#include <linux/smp_lock.h>



#include <asm/compat.h>

#include <asm/ccwdev.h>

#include <asm/cio.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

fs3270_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

{

	char __user *argp;

	struct fs3270 *fp;

	struct raw3270_iocb iocb;

	int rc;
@@ -329,6 +331,10 @@ fs3270_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
	fp = filp->private_data;

	if (!fp)

		return -ENODEV;

	if (is_compat_task())

		argp = compat_ptr(arg);

	else

		argp = (char __user *)arg;

	rc = 0;

	mutex_lock(&fs3270_mutex);

	switch (cmd) {
@@ -339,10 +345,10 @@ fs3270_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		fp->write_command = arg;

		break;

	case TUBGETI:

		rc = put_user(fp->read_command, (char __user *) arg);

		rc = put_user(fp->read_command, argp);

		break;

	case TUBGETO:

		rc = put_user(fp->write_command,(char __user *) arg);

		rc = put_user(fp->write_command, argp);

		break;

	case TUBGETMOD:

		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.re_cnt = 20;

		iocb.map = 0;

		if (copy_to_user((char __user *) arg, &iocb,

				 sizeof(struct raw3270_iocb)))

		if (copy_to_user(argp, &iocb, sizeof(struct raw3270_iocb)))

			rc = -EFAULT;

		break;

	}