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

Commit 44adbac8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.tty-ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull tty ioctl updates from Al Viro:
 "This is the compat_ioctl work related to tty ioctls.

  Quite a bit of dead code taken out, all tty-related stuff gone from
  fs/compat_ioctl.c. A bunch of compat bugs fixed - some still remain,
  but all more or less generic tty-related ioctls should be covered
  (remaining issues are in things like driver-private ioctls in a pcmcia
  serial card driver not getting properly handled in 32bit processes on
  64bit host, etc)"

* 'work.tty-ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (53 commits)
  kill TIOCSERGSTRUCT
  change semantics of ldisc ->compat_ioctl()
  kill TIOCSER[SG]WILD
  synclink_gt(): fix compat_ioctl()
  pty: fix compat ioctls
  compat_ioctl - kill keyboard ioctl handling
  gigaset: add ->compat_ioctl()
  vt_compat_ioctl(): clean up, use compat_ptr() properly
  gigaset: don't try to printk userland buffer contents
  dgnc: don't bother with (empty) stub for TCXONC
  dgnc: leave TIOC[GS]SOFTCAR to ldisc
  remove fallback to drivers for TIOCGICOUNT
  dgnc: break-related ioctls won't reach ->ioctl()
  kill the rest of tty COMPAT_IOCTL() entries
  dgnc: TIOCM... won't reach ->ioctl()
  isdn_tty: TCSBRK{,P} won't reach ->ioctl()
  kill capinc_tty_ioctl()
  take compat TIOC[SG]SERIAL treatment into tty_compat_ioctl()
  synclink: reduce pointless checks in ->ioctl()
  complete ->[sg]et_serial() switchover
  ...
parents 08ffb584 ce5a9831

arch/ia64/hp/sim/simserial.c

+13 −11
Original line number Diff line number Diff line
@@ -297,29 +297,29 @@ static void rs_unthrottle(struct tty_struct * tty) 
	printk(KERN_INFO "simrs_unthrottle called\n");

}



static int rs_setserial(struct tty_struct *tty, struct serial_struct *ss)

{

	return 0;

}



static int rs_getserial(struct tty_struct *tty, struct serial_struct *ss)

{

	return 0;

}



static int rs_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg)

{

	if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&

	    (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) &&

	    (cmd != TIOCMIWAIT)) {

	if ((cmd != TIOCSERCONFIG) && (cmd != TIOCMIWAIT)) {

		if (tty_io_error(tty))

		    return -EIO;

	}



	switch (cmd) {

	case TIOCGSERIAL:

	case TIOCSSERIAL:

	case TIOCSERGSTRUCT:

	case TIOCMIWAIT:

		return 0;

	case TIOCSERCONFIG:

	case TIOCSERGETLSR: /* Get line status register */

		return -EINVAL;

	case TIOCSERGWILD:

	case TIOCSERSWILD:

		/* "setserial -W" is called in Debian boot */

		printk (KERN_INFO "TIOCSER?WILD ioctl obsolete, ignored.\n");

		return 0;

	}

	return -ENOIOCTLCMD;

}
@@ -448,6 +448,8 @@ static const struct tty_operations hp_ops = { 
	.throttle = rs_throttle,

	.unthrottle = rs_unthrottle,

	.send_xchar = rs_send_xchar,

	.set_serial = rs_setserial,

	.get_serial = rs_getserial,

	.hangup = rs_hangup,

	.proc_show = rs_proc_show,

};

drivers/bluetooth/hci_ldisc.c

+1 −0
Original line number Diff line number Diff line
@@ -823,6 +823,7 @@ static int __init hci_uart_init(void) 
	hci_uart_ldisc.read		= hci_uart_tty_read;

	hci_uart_ldisc.write		= hci_uart_tty_write;

	hci_uart_ldisc.ioctl		= hci_uart_tty_ioctl;

	hci_uart_ldisc.compat_ioctl	= hci_uart_tty_ioctl;

	hci_uart_ldisc.poll		= hci_uart_tty_poll;

	hci_uart_ldisc.receive_buf	= hci_uart_tty_receive;

	hci_uart_ldisc.write_wakeup	= hci_uart_tty_wakeup;

drivers/char/pcmcia/synclink_cs.c

+1 −2
Original line number Diff line number Diff line
@@ -2237,8 +2237,7 @@ static int mgslpc_ioctl(struct tty_struct *tty, 
	if (mgslpc_paranoia_check(info, tty->name, "mgslpc_ioctl"))

		return -ENODEV;



	if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&

	    (cmd != TIOCMIWAIT)) {

	if (cmd != TIOCMIWAIT) {

		if (tty_io_error(tty))

		    return -EIO;

	}

drivers/input/serio/serport.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static int serport_ldisc_ioctl(struct tty_struct *tty, struct file *file, 


#ifdef CONFIG_COMPAT

#define COMPAT_SPIOCSTYPE	_IOW('q', 0x01, compat_ulong_t)

static long serport_ldisc_compat_ioctl(struct tty_struct *tty,

static int serport_ldisc_compat_ioctl(struct tty_struct *tty,

				       struct file *file,

				       unsigned int cmd, unsigned long arg)

{

drivers/isdn/capi/capi.c

+0 −7
Original line number Diff line number Diff line
@@ -1155,12 +1155,6 @@ static int capinc_tty_chars_in_buffer(struct tty_struct *tty) 
	return mp->outbytes;

}



static int capinc_tty_ioctl(struct tty_struct *tty,

			    unsigned int cmd, unsigned long arg)

{

	return -ENOIOCTLCMD;

}



static void capinc_tty_set_termios(struct tty_struct *tty, struct ktermios *old)

{

	pr_debug("capinc_tty_set_termios\n");
@@ -1236,7 +1230,6 @@ static const struct tty_operations capinc_ops = { 
	.flush_chars = capinc_tty_flush_chars,

	.write_room = capinc_tty_write_room,

	.chars_in_buffer = capinc_tty_chars_in_buffer,

	.ioctl = capinc_tty_ioctl,

	.set_termios = capinc_tty_set_termios,

	.throttle = capinc_tty_throttle,

	.unthrottle = capinc_tty_unthrottle,