From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org
Subject: [PATCH 70/80] tty: some ICANON magic is in the wrong places
Date: Mon, 13 Oct 2008 10:44:17 +0100 [thread overview]
Message-ID: <20081013094413.21645.77486.stgit@localhost.localdomain> (raw)
In-Reply-To: <20081013092758.21645.2359.stgit@localhost.localdomain>
From: Alan Cox <alan@redhat.com>
Move the set up on ldisc change into the ldisc
Move the INQ/OUTQ cases into the driver not in shared ioctl code where it
gives bogus answers for other ldisc values
Signed-off-by: Alan Cox <alan@redhat.com>
---
drivers/bluetooth/hci_ldisc.c | 2 +-
drivers/char/n_hdlc.c | 2 +-
drivers/char/n_tty.c | 53 +++++++++++++++++++++++++++++++++++++++--
drivers/char/tty_ioctl.c | 42 ++------------------------------
include/linux/tty.h | 2 +-
5 files changed, 56 insertions(+), 45 deletions(-)
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 8dfcf77..4426bb5 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -484,7 +484,7 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file * file,
return -EUNATCH;
default:
- err = n_tty_ioctl(tty, file, cmd, arg);
+ err = n_tty_ioctl_helper(tty, file, cmd, arg);
break;
};
diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c
index 69ec639..bacb3e2 100644
--- a/drivers/char/n_hdlc.c
+++ b/drivers/char/n_hdlc.c
@@ -764,7 +764,7 @@ static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,
break;
default:
- error = n_tty_ioctl (tty, file, cmd, arg);
+ error = n_tty_ioctl_helper(tty, file, cmd, arg);
break;
}
return error;
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index 708c2b1..b4f5dcc 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -1011,8 +1011,20 @@ int is_ignored(int sig)
static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
{
- if (!tty)
- return;
+ int canon_change = 1;
+ BUG_ON(!tty);
+
+ if (old)
+ canon_change = (old->c_lflag ^ tty->termios->c_lflag) & ICANON;
+ if (canon_change) {
+ memset(&tty->read_flags, 0, sizeof tty->read_flags);
+ tty->canon_head = tty->read_tail;
+ tty->canon_data = 0;
+ tty->erasing = 0;
+ }
+
+ if (canon_change && !L_ICANON(tty) && tty->read_cnt)
+ wake_up_interruptible(&tty->read_wait);
tty->icanon = (L_ICANON(tty) != 0);
if (test_bit(TTY_HW_COOK_IN, &tty->flags)) {
@@ -1573,6 +1585,43 @@ static unsigned int normal_poll(struct tty_struct *tty, struct file *file,
return mask;
}
+static unsigned long inq_canon(struct tty_struct *tty)
+{
+ int nr, head, tail;
+
+ if (!tty->canon_data || !tty->read_buf)
+ return 0;
+ head = tty->canon_head;
+ tail = tty->read_tail;
+ nr = (head - tail) & (N_TTY_BUF_SIZE-1);
+ /* Skip EOF-chars.. */
+ while (head != tail) {
+ if (test_bit(tail, tty->read_flags) &&
+ tty->read_buf[tail] == __DISABLED_CHAR)
+ nr--;
+ tail = (tail+1) & (N_TTY_BUF_SIZE-1);
+ }
+ return nr;
+}
+
+static int n_tty_ioctl(struct tty_struct *tty, struct file *file,
+ unsigned int cmd, unsigned long arg)
+{
+ int retval;
+
+ switch (cmd) {
+ case TIOCOUTQ:
+ return put_user(tty_chars_in_buffer(tty), (int __user *) arg);
+ case TIOCINQ:
+ retval = tty->read_cnt;
+ if (L_ICANON(tty))
+ retval = inq_canon(tty);
+ return put_user(retval, (unsigned int __user *) arg);
+ default:
+ return n_tty_ioctl_helper(tty, file, cmd, arg);
+ }
+}
+
struct tty_ldisc_ops tty_ldisc_N_TTY = {
.magic = TTY_LDISC_MAGIC,
.name = "n_tty",
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index 14cc19c..a408c8e 100644
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -489,7 +489,6 @@ EXPORT_SYMBOL(tty_termios_hw_change);
static void change_termios(struct tty_struct *tty, struct ktermios *new_termios)
{
- int canon_change;
struct ktermios old_termios;
struct tty_ldisc *ld;
unsigned long flags;
@@ -505,18 +504,6 @@ static void change_termios(struct tty_struct *tty, struct ktermios *new_termios)
old_termios = *tty->termios;
*tty->termios = *new_termios;
unset_locked_termios(tty->termios, &old_termios, tty->termios_locked);
- canon_change = (old_termios.c_lflag ^ tty->termios->c_lflag) & ICANON;
- if (canon_change) {
- memset(&tty->read_flags, 0, sizeof tty->read_flags);
- tty->canon_head = tty->read_tail;
- tty->canon_data = 0;
- tty->erasing = 0;
- }
-
- /* This bit should be in the ldisc code */
- if (canon_change && !L_ICANON(tty) && tty->read_cnt)
- /* Get characters left over from canonical mode. */
- wake_up_interruptible(&tty->read_wait);
/* See if packet mode change of state. */
if (tty->link && tty->link->packet) {
@@ -677,24 +664,6 @@ static int set_termiox(struct tty_struct *tty, void __user *arg, int opt)
#endif
-static unsigned long inq_canon(struct tty_struct *tty)
-{
- int nr, head, tail;
-
- if (!tty->canon_data || !tty->read_buf)
- return 0;
- head = tty->canon_head;
- tail = tty->read_tail;
- nr = (head - tail) & (N_TTY_BUF_SIZE-1);
- /* Skip EOF-chars.. */
- while (head != tail) {
- if (test_bit(tail, tty->read_flags) &&
- tty->read_buf[tail] == __DISABLED_CHAR)
- nr--;
- tail = (tail+1) & (N_TTY_BUF_SIZE-1);
- }
- return nr;
-}
#ifdef TIOCGETP
/*
@@ -1110,7 +1079,7 @@ int tty_perform_flush(struct tty_struct *tty, unsigned long arg)
}
EXPORT_SYMBOL_GPL(tty_perform_flush);
-int n_tty_ioctl(struct tty_struct *tty, struct file *file,
+int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,
unsigned int cmd, unsigned long arg)
{
unsigned long flags;
@@ -1148,13 +1117,6 @@ int n_tty_ioctl(struct tty_struct *tty, struct file *file,
return 0;
case TCFLSH:
return tty_perform_flush(tty, arg);
- case TIOCOUTQ:
- return put_user(tty_chars_in_buffer(tty), (int __user *) arg);
- case TIOCINQ:
- retval = tty->read_cnt;
- if (L_ICANON(tty))
- retval = inq_canon(tty);
- return put_user(retval, (unsigned int __user *) arg);
case TIOCPKT:
{
int pktmode;
@@ -1180,4 +1142,4 @@ int n_tty_ioctl(struct tty_struct *tty, struct file *file,
return tty_mode_ioctl(tty, file, cmd, arg);
}
}
-EXPORT_SYMBOL(n_tty_ioctl);
+EXPORT_SYMBOL(n_tty_ioctl_helper);
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 3c7c757..3b8121d 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -466,7 +466,7 @@ static inline void tty_audit_push_task(struct task_struct *tsk,
#endif
/* tty_ioctl.c */
-extern int n_tty_ioctl(struct tty_struct *tty, struct file *file,
+extern int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,
unsigned int cmd, unsigned long arg);
/* serial.c */
next prev parent reply other threads:[~2008-10-13 10:01 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-13 9:31 [PATCH 00/80] TTY updates for 2.6.28 Alan Cox
2008-10-13 9:31 ` [PATCH 01/80] drivers/serial/crisv10.c: add missing put_tty_driver Alan Cox
2008-10-13 9:31 ` [PATCH 02/80] drivers/char/hvc_console.c: adjust call to put_tty_driver Alan Cox
2008-10-13 9:31 ` [PATCH 03/80] coldfire: scheduled SERIAL_COLDFIRE removal Alan Cox
2008-10-13 9:32 ` [PATCH 04/80] epca: call tty_port_init Alan Cox
2008-10-13 9:32 ` [PATCH 05/80] Blackfin Serial Driver: use __initdata for data, not __init Alan Cox
2008-10-13 9:32 ` [PATCH 06/80] Blackfin Serial Driver: Fix bug - should suspend/resume/remove all uart ports Alan Cox
2008-10-13 9:33 ` [PATCH 07/80] Blackfin Serial Driver: trim trailing whitespace -- no functional changes Alan Cox
2008-10-13 9:33 ` [PATCH 08/80] Blackfin Serial Driver: move common variables out of serial headers and into the serial driver Alan Cox
2008-10-13 9:33 ` [PATCH 09/80] Blackfin Serial Driver: Remove useless stop Alan Cox
2008-10-13 9:33 ` [PATCH 10/80] Blackfin Serial Driver: Fix bug - Don't call tx_stop in tx_transfer Alan Cox
2008-10-13 9:33 ` [PATCH 11/80] Blackfin Serial Driver: Fix bug - ircp fails on sir over Blackfin UART Alan Cox
2008-10-13 9:33 ` [PATCH 12/80] Blackfin Serial Driver: Fix bug - request UART2/3 peripheral mapped interrupts in PIO mode Alan Cox
2008-10-13 9:34 ` [PATCH 13/80] Fix oti6858 debug level Alan Cox
2008-10-13 9:34 ` [PATCH 14/80] Char: cyclades. remove bogus iomap Alan Cox
2008-10-13 9:34 ` [PATCH 15/80] Char: sx, fix io unmapping Alan Cox
2008-10-13 9:34 ` [PATCH 16/80] Char: merge ip2main and ip2base Alan Cox
2008-10-13 9:34 ` [PATCH 17/80] ip2, cleanup globals Alan Cox
2008-10-13 9:34 ` [PATCH 18/80] ip2, fix sparse warnings Alan Cox
2008-10-13 9:34 ` [PATCH 19/80] ip2, init/deinit cleanup Alan Cox
2008-10-13 9:35 ` [PATCH 20/80] ip2: avoid add_timer with pending timer Alan Cox
2008-10-13 9:35 ` [PATCH 21/80] audit: Handle embedded NUL in TTY input auditing Alan Cox
2008-10-13 9:35 ` [PATCH 22/80] serial: Make uart_port's ioport "unsigned long" Alan Cox
2008-10-13 9:35 ` [PATCH 23/80] nozomi: Fix close on error Alan Cox
2008-10-13 9:35 ` [PATCH 24/80] serial-make-uart_ports-ioport-unsigned-long-fix Alan Cox
2008-10-13 9:35 ` [PATCH 25/80] usb: fix pl2303 initialization Alan Cox
2008-10-13 9:36 ` [PATCH 26/80] ftdi: A few errors are err() that should be debug which causes much spewage Alan Cox
2008-10-13 9:36 ` [PATCH 27/80] serial_8250: pci_enable_device fail is not fully handled Alan Cox
2008-10-13 9:36 ` [PATCH 28/80] 8250: remove a few inlines of dubious value Alan Cox
2008-10-13 9:36 ` [PATCH 29/80] serial: allow 8250 to be used on sparc Alan Cox
2008-10-13 9:36 ` [PATCH 30/80] tty: move tioclinux from a special case Alan Cox
2008-10-13 9:36 ` [PATCH 31/80] uml: small cleanups and note bugs to be dealt with by uml authors Alan Cox
2008-10-13 9:36 ` [PATCH 32/80] tty: split the buffering from tty_io Alan Cox
2008-10-13 9:37 ` [PATCH 33/80] tty: Split tty_port into its own file Alan Cox
2008-10-13 9:37 ` [PATCH 34/80] pps: Reserve a line discipline number for PPS Alan Cox
2008-10-13 9:37 ` [PATCH 35/80] tty: Add a kref count Alan Cox
2008-10-13 9:37 ` [PATCH 36/80] tty: use krefs to protect driver module counts Alan Cox
2008-10-13 9:37 ` [PATCH 37/80] tty: Cris has a nice RS485 ioctl so we should steal it Alan Cox
2008-10-13 9:38 ` [PATCH 38/80] tty: ipw need reworking Alan Cox
2008-10-13 9:38 ` [PATCH 39/80] tty: Add termiox Alan Cox
2008-10-13 9:38 ` [PATCH 40/80] tty: Termios locking - sort out real_tty confusions and lock reads Alan Cox
2008-10-13 9:39 ` [PATCH 41/80] tty: compare the tty winsize Alan Cox
2008-10-13 9:39 ` [PATCH 42/80] tty: Make get_current_tty use a kref Alan Cox
2008-10-13 9:39 ` [PATCH 43/80] tty: Move tty_write_message out of kernel/printk Alan Cox
2008-10-13 9:39 ` [PATCH 44/80] tty: usb-serial krefs Alan Cox
2008-10-13 9:39 ` [PATCH 45/80] tty: kref usage for isicom and moxa Alan Cox
2008-10-13 9:40 ` [PATCH 46/80] stallion: Use krefs Alan Cox
2008-10-13 9:40 ` [PATCH 47/80] mxser: Switch to kref tty Alan Cox
2008-10-13 9:40 ` [PATCH 48/80] tty: the vhangup syscall is racy Alan Cox
2008-10-13 9:40 ` [PATCH 49/80] tty: Redo current tty locking Alan Cox
2008-10-13 9:40 ` [PATCH 50/80] tty: Fix abusers of current->sighand->tty Alan Cox
2008-10-13 9:41 ` [PATCH 51/80] pty: If the administrator creates a device for a ptmx slave we should not error Alan Cox
2008-10-13 9:41 ` [PATCH 52/80] vt: remove bogus lock dropping Alan Cox
2008-10-13 9:41 ` [PATCH 53/80] tty: shutdown method Alan Cox
2008-10-13 9:41 ` [PATCH 54/80] tty: Remove more special casing and out of place code Alan Cox
2008-10-13 9:41 ` [PATCH 55/80] tty: Move parts of tty_init_dev into new functions Alan Cox
2008-10-13 9:42 ` [PATCH 56/80] tty: Clean up the tty_init_dev changes further Alan Cox
2008-10-13 9:42 ` [PATCH 57/80] tty: kref the tty driver object Alan Cox
2008-10-13 9:42 ` [PATCH 58/80] tty: More driver operations Alan Cox
2008-10-13 9:42 ` [PATCH 59/80] tty: Finish fixing up the init_dev interface to use ERR_PTR Alan Cox
2008-10-13 9:42 ` [PATCH 60/80] tty: extract the pty init time special cases Alan Cox
2008-10-13 9:42 ` [PATCH 61/80] Move tty lookup/reopen to caller Alan Cox
2008-10-13 9:42 ` [PATCH 62/80] Add an instance parameter devpts interfaces Alan Cox
2008-10-13 9:43 ` [PATCH 63/80] Simplify devpts_get_tty() Alan Cox
2008-10-13 9:43 ` [PATCH 64/80] Simplify devpts_pty_new() Alan Cox
2008-10-13 9:43 ` [PATCH 65/80] Simplify devpts_pty_kill Alan Cox
2008-10-13 9:43 ` [PATCH 66/80] pty: Coding style and polish Alan Cox
2008-10-13 9:43 ` [PATCH 67/80] pty: Fix allocation failure double free Alan Cox
2008-10-13 9:43 ` [PATCH 68/80] pty: simplify unix98 allocation Alan Cox
2008-10-13 9:44 ` [PATCH 69/80] tty: simplify ktermios allocation Alan Cox
2008-10-13 9:44 ` Alan Cox [this message]
2008-10-13 9:44 ` [PATCH 71/80] tty: Fallout from tty-move-canon-specials Alan Cox
2008-10-13 9:44 ` [PATCH 72/80] tty: fix up gigaset a bit Alan Cox
2008-10-16 15:50 ` Tilman Schmidt
2008-10-17 11:40 ` Alan Cox
2008-10-19 12:28 ` Tilman Schmidt
2008-10-22 9:00 ` Alan Cox
2008-10-24 11:21 ` Tilman Schmidt
2008-10-13 9:44 ` [PATCH 73/80] tty: Remove lots of NULL checks Alan Cox
2008-10-13 9:45 ` [PATCH 74/80] tty: Minor tidyups and document fixes for n_tty Alan Cox
2008-10-13 9:45 ` [PATCH 75/80] applicom: Fix an unchecked user ioctl range and an error return Alan Cox
2008-10-13 9:45 ` [PATCH 76/80] serial: fix device name reporting when minor space is shared between drivers Alan Cox
2008-10-13 9:45 ` [PATCH 77/80] tty: tty_io.c shadows sparse fix Alan Cox
2008-10-13 9:45 ` [PATCH 78/80] fs3270: remove extra locks Alan Cox
2008-10-13 9:46 ` [PATCH 79/80] fs3270: Correct error returns Alan Cox
2008-10-13 9:46 ` [PATCH 80/80] tty: rename the remaining oddly named n_tty functions Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081013094413.21645.77486.stgit@localhost.localdomain \
--to=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox