Skip to contentSkip to conversation

TTY fix for 2.6.32-git

PATCH New Greg KH 1 participant 2 messages Oct 14, 2009 Char and misc drivers

lore
Share & tools
lore

Greg KH

author
#0 lore raw

PATCH 1/1 TTY fix for 2.6.32-git

Here is one tty bugfix for your kernel tree.

It's been in the -next and -mm trees for a while.

Please pull from:

	master.kernel.org:/pub/scm/linux/kernel/git/gregkh/tty-2.6.git/

The full patches will be sent to the linux-kernel mailing list, if anyone wants to see them.

thanks,

greg k-h

------------

 drivers/char/vt_ioctl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

---------------

Andreas Schwab (1):
tty: fix vt_compat_ioctl

#1 lore raw

PATCH 1/1 tty: fix vt_compat_ioctl

From: Andreas Schwab <[email protected]>

Call compat_unimap_ioctl, not do_unimap_ioctl.

This was broken by commit e9216651.

The compat_unimap_ioctl was originally called do_unimap_ioctl in fs/compat_ioctl.h which got moved to drivers/char/vt_ioctl.c. In that patch, the caller was not updated and consequently called the native handler.

---
 drivers/char/vt_ioctl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/char/vt_ioctl.c +1 -1
index 6b36ee5..ed86d3b 100644
@@ -1532,7 +1532,7 @@ long vt_compat_ioctl(struct tty_struct *tty, struct file * file,
 
 	case PIO_UNIMAP:
 	case GIO_UNIMAP:
-		ret = do_unimap_ioctl(cmd, up, perm, vc);
+		ret = compat_unimap_ioctl(cmd, up, perm, vc);
 		break;
 
 	/*
Signature · 1 line
1.6.4.2