openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ppdev: add support for compat ioctl 

The arg of ioctl in ppdev is the pointer of integer except the
timeval in PPSETTIME, PPGETTIME. Different size of timeval
is already supported by the previous patches. So, it is safe
to add compat support.

Signed-off-by: Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bamvor Jian Zhang 2016-01-08 15:50:49 +08:00 committed by Greg Kroah-Hartman
parent 3b9ab374a1
commit 17a3596f21
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/char/ppdev.c
View File

@ -69,6 +69,7 @@
#include <linux/ppdev.h> #include <linux/ppdev.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/compat.h>
#define PP_VERSION "ppdev: user-space parallel port driver" #define PP_VERSION "ppdev: user-space parallel port driver"
#define CHRDEV "ppdev" #define CHRDEV "ppdev"
@ -670,6 +671,14 @@ static long pp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return ret; return ret;
} }
#ifdef CONFIG_COMPAT
static long pp_compat_ioctl(struct file *file, unsigned int cmd,
unsigned long arg)
{
return pp_ioctl(file, cmd, (unsigned long)compat_ptr(arg));
}
#endif
static int pp_open (struct inode * inode, struct file * file) static int pp_open (struct inode * inode, struct file * file)
{ {
unsigned int minor = iminor(inode); unsigned int minor = iminor(inode);
@ -779,6 +788,9 @@ static const struct file_operations pp_fops = {
.write = pp_write, .write = pp_write,
.poll = pp_poll, .poll = pp_poll,
.unlocked_ioctl = pp_ioctl, .unlocked_ioctl = pp_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = pp_compat_ioctl,
#endif
.open = pp_open, .open = pp_open,
.release = pp_release, .release = pp_release,
}; };