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

Commit 8193c429 authored by Thomas Meyer's avatar Thomas Meyer Committed by Greg Kroah-Hartman
Browse files

tty: Support compat_ioctl get/set termios_locked 



When running a Fedora 15 (x86) on an x86_64 kernel, in the boot process
plymouthd complains about those two missing ioctls:
[    2.581783] ioctl32(plymouthd:186): Unknown cmd fd(10) cmd(00005457){t:'T';sz:0} arg(ffb6a5d0) on /dev/tty1
[    2.581803] ioctl32(plymouthd:186): Unknown cmd fd(10) cmd(00005456){t:'T';sz:0} arg(ffb6a680) on /dev/tty1

both ioctl functions work on the 'struct termios' resp. 'struct termios2',
which has the same size (36 bytes resp. 44 bytes) on x86 and x86_64,
so it's just a matter of converting the pointer from userland.

Signed-off-by: default avatarThomas Meyer <thomas@m3y3r.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 36116245

drivers/tty/tty_io.c

+2 −0
Original line number Diff line number Diff line
@@ -2717,6 +2717,8 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd, 
	ld = tty_ldisc_ref_wait(tty);

	if (ld->ops->compat_ioctl)

		retval = ld->ops->compat_ioctl(tty, file, cmd, arg);

	else

		retval = n_tty_compat_ioctl_helper(tty, file, cmd, arg);

	tty_ldisc_deref(ld);



	return retval;

drivers/tty/tty_ioctl.c

+17 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/module.h>

#include <linux/bitops.h>

#include <linux/mutex.h>

#include <linux/compat.h>



#include <asm/io.h>

#include <asm/uaccess.h>
@@ -1179,3 +1180,19 @@ int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file, 
	}

}

EXPORT_SYMBOL(n_tty_ioctl_helper);



#ifdef CONFIG_COMPAT

long n_tty_compat_ioctl_helper(struct tty_struct *tty, struct file *file,

					unsigned int cmd, unsigned long arg)

{

	switch (cmd) {

	case TIOCGLCKTRMIOS:

	case TIOCSLCKTRMIOS:

		return tty_mode_ioctl(tty, file, cmd, (unsigned long) compat_ptr(arg));

	default:

		return -ENOIOCTLCMD;

	}

}

EXPORT_SYMBOL(n_tty_compat_ioctl_helper);

#endif

include/linux/tty.h

+2 −0
Original line number Diff line number Diff line
@@ -579,6 +579,8 @@ extern int __init tty_init(void); 
/* tty_ioctl.c */

extern int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,

		       unsigned int cmd, unsigned long arg);

extern long n_tty_compat_ioctl_helper(struct tty_struct *tty, struct file *file,

		       unsigned int cmd, unsigned long arg);



/* serial.c */