[PATCH 0/1] hidraw: compat_ioctl for hidraw

[PATCH 0/1] hidraw: compat_ioctl for hidraw

[Alan Ott]

hidraw did not have a compat_ioctl set, causing ioctls to fail from 32-bit apps on 64-bit systems. This patch seems to make ioctls work from 32-bit apps.

I made this look like the one in drivers/input/joydev.c. I'm not 100% sure that this is all that needs to be done, so it'd be nice if someone could review it.

Alan Ott (1):
  hidraw: Added Compatibility ioctl() for 32-bit applications.

 drivers/hid/hidraw.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

[PATCH 1/1] hidraw: Added Compatibility ioctl() for 32-bit applications.

[Alan Ott]

Added the ioctl function to the compat_ioctl pointer in the file_operations struct. Before this, some ioctls would fail for 32-bit apps on 64-bit systems.

Signed-off-by: Alan Ott <alan@signal11.us>
---
 drivers/hid/hidraw.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 29495e6..57ccc5f 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -428,6 +428,9 @@ static const struct file_operations hidraw_ops = {
 	.open =         hidraw_open,
 	.release =      hidraw_release,
 	.unlocked_ioctl = hidraw_ioctl,
+#ifdef CONFIG_COMPAT
+	.compat_ioctl	= hidraw_ioctl,
+#endif
 };
 
 void hidraw_report_event(struct hid_device *hid, u8 *data, int len)
-- 
1.7.0.4

Re: [PATCH 1/1] hidraw: Added Compatibility ioctl() for 32-bit applications.

[Arnd Bergmann]

On Tuesday 04 January 2011 06:37:22 Alan Ott wrote:
> Added the ioctl function to the compat_ioctl pointer in the
> file_operations struct. Before this, some ioctls would 
> fail for 32-bit apps on 64-bit systems.
> 
> Signed-off-by: Alan Ott <alan@signal11.us>

Acked-by: Arnd Bergmann <arnd@arndb.de>

I verified that all the ioctls for hidraw are indeed compatible.

	Arnd

Re: [PATCH 1/1] hidraw: Added Compatibility ioctl() for 32-bit applications.

[Jiri Kosina]

On Tue, 4 Jan 2011, Arnd Bergmann wrote:

> On Tuesday 04 January 2011 06:37:22 Alan Ott wrote:
> > Added the ioctl function to the compat_ioctl pointer in the
> > file_operations struct. Before this, some ioctls would 
> > fail for 32-bit apps on 64-bit systems.
> > 
> > Signed-off-by: Alan Ott <alan@signal11.us>
> 
> Acked-by: Arnd Bergmann <arnd@arndb.de>

Applied, thanks guys.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.