From: Arnd Bergmann <arnd@arndb.de>
To: Greg KH <gregkh@suse.de>
Cc: linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
Alan Cox <alan@lxorguk.ukuu.org.uk>,
Frederic Weisbecker <fweisbec@gmail.com>,
John Kacur <jkacur@redhat.com>, Alan Cox <alan@linux.intel.com>
Subject: [PATCH 12/31] tty: serial - fix tty back references in termios
Date: Tue, 1 Jun 2010 22:52:52 +0200 [thread overview]
Message-ID: <1275425591-8803-13-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1275425591-8803-1-git-send-email-arnd@arndb.de>
From: Alan Cox <alan@linux.intel.com>
One or two drivers go poking back into the tty from the termios setting
routine in unsafe ways. We don't need to pass the tty down because the
[ab]users are just using it to get at things they can get at anyway.
This leaves low_latency setting to sort out along with set_ldisc use.
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
drivers/serial/21285.c | 10 +++-------
drivers/serial/imx.c | 10 ++++------
drivers/serial/ioc3_serial.c | 9 +++++----
drivers/serial/ioc4_serial.c | 9 +++++----
drivers/serial/max3100.c | 7 ++-----
5 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index 8681f13..d89aa38 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -216,7 +216,7 @@ serial21285_set_termios(struct uart_port *port, struct ktermios *termios,
struct ktermios *old)
{
unsigned long flags;
- unsigned int baud, quot, h_lcr;
+ unsigned int baud, quot, h_lcr, b;
/*
* We don't support modem control lines.
@@ -234,12 +234,8 @@ serial21285_set_termios(struct uart_port *port, struct ktermios *termios,
*/
baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
quot = uart_get_divisor(port, baud);
-
- if (port->state && port->state->port.tty) {
- struct tty_struct *tty = port->state->port.tty;
- unsigned int b = port->uartclk / (16 * quot);
- tty_encode_baud_rate(tty, b, b);
- }
+ b = port->uartclk / (16 * quot);
+ tty_termios_encode_baud_rate(termios, b, b);
switch (termios->c_cflag & CSIZE) {
case CS5:
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index eacb588..66ecc7a 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -909,13 +909,11 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
rational_best_approximation(16 * div * baud, sport->port.uartclk,
1 << 16, 1 << 16, &num, &denom);
- if (port->state && port->state->port.tty) {
- tdiv64 = sport->port.uartclk;
- tdiv64 *= num;
- do_div(tdiv64, denom * 16 * div);
- tty_encode_baud_rate(sport->port.state->port.tty,
+ tdiv64 = sport->port.uartclk;
+ tdiv64 *= num;
+ do_div(tdiv64, denom * 16 * div);
+ tty_termios_encode_baud_rate(termios,
(speed_t)tdiv64, (speed_t)tdiv64);
- }
num -= 1;
denom -= 1;
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c
index f164ba4..bd2e9e6 100644
--- a/drivers/serial/ioc3_serial.c
+++ b/drivers/serial/ioc3_serial.c
@@ -954,12 +954,13 @@ ioc3_change_speed(struct uart_port *the_port,
struct ktermios *new_termios, struct ktermios *old_termios)
{
struct ioc3_port *port = get_ioc3_port(the_port);
- unsigned int cflag;
+ unsigned int cflag, iflag;
int baud;
int new_parity = 0, new_parity_enable = 0, new_stop = 0, new_data = 8;
struct uart_state *state = the_port->state;
cflag = new_termios->c_cflag;
+ iflag = new_termios->c_iflag;
switch (cflag & CSIZE) {
case CS5:
@@ -1000,12 +1001,12 @@ ioc3_change_speed(struct uart_port *the_port,
state->port.tty->low_latency = 1;
- if (I_IGNPAR(state->port.tty))
+ if (iflag & IGNPAR))
the_port->ignore_status_mask &= ~(N_PARITY_ERROR
| N_FRAMING_ERROR);
- if (I_IGNBRK(state->port.tty)) {
+ if (iflag & IGNBRK) {
the_port->ignore_status_mask &= ~N_BREAK;
- if (I_IGNPAR(state->port.tty))
+ if (iflag & IGNPAR)
the_port->ignore_status_mask &= ~N_OVERRUN_ERROR;
}
if (!(cflag & CREAD)) {
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index 8ad28fc..2c30023 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -1685,11 +1685,12 @@ ioc4_change_speed(struct uart_port *the_port,
{
struct ioc4_port *port = get_ioc4_port(the_port, 0);
int baud, bits;
- unsigned cflag;
+ unsigned cflag, iflag;
int new_parity = 0, new_parity_enable = 0, new_stop = 0, new_data = 8;
struct uart_state *state = the_port->state;
cflag = new_termios->c_cflag;
+ iflag = new_termios->c_iflag;
switch (cflag & CSIZE) {
case CS5:
@@ -1741,12 +1742,12 @@ ioc4_change_speed(struct uart_port *the_port,
state->port.tty->low_latency = 1;
- if (I_IGNPAR(state->port.tty))
+ if (iflag & IGNPAR)
the_port->ignore_status_mask &= ~(N_PARITY_ERROR
| N_FRAMING_ERROR);
- if (I_IGNBRK(state->port.tty)) {
+ if (iflag & IGNBRK) {
the_port->ignore_status_mask &= ~N_BREAK;
- if (I_IGNPAR(state->port.tty))
+ if (iflag & IGNPAR))
the_port->ignore_status_mask &= ~N_OVERRUN_ERROR;
}
if (!(cflag & CREAD)) {
diff --git a/drivers/serial/max3100.c b/drivers/serial/max3100.c
index 3351c3b..beb1afa 100644
--- a/drivers/serial/max3100.c
+++ b/drivers/serial/max3100.c
@@ -430,17 +430,14 @@ max3100_set_termios(struct uart_port *port, struct ktermios *termios,
int baud = 0;
unsigned cflag;
u32 param_new, param_mask, parity = 0;
- struct tty_struct *tty = s->port.state->port.tty;
dev_dbg(&s->spi->dev, "%s\n", __func__);
- if (!tty)
- return;
cflag = termios->c_cflag;
param_new = 0;
param_mask = 0;
- baud = tty_get_baud_rate(tty);
+ baud = tty_termios_baud_rate(termios);
param_new = s->conf & MAX3100_BAUD;
switch (baud) {
case 300:
@@ -485,7 +482,7 @@ max3100_set_termios(struct uart_port *port, struct ktermios *termios,
default:
baud = s->baud;
}
- tty_encode_baud_rate(tty, baud, baud);
+ tty_termios_encode_baud_rate(termios, baud, baud);
s->baud = baud;
param_mask |= MAX3100_BAUD;
--
1.7.0.4
next prev parent reply other threads:[~2010-06-01 20:53 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-01 20:52 [PATCH 00/31] tty: BKL removal Arnd Bergmann
2010-06-01 20:52 ` [PATCH 01/31] stallion: prune lock_kernel calls Arnd Bergmann
2010-06-01 20:52 ` [PATCH 02/31] istallion: use bit ops for the board flags Arnd Bergmann
2010-06-01 20:52 ` [PATCH 03/31] riscom8: kill use of lock_kernel Arnd Bergmann
2010-06-01 20:52 ` [PATCH 04/31] isicom: kill off the BKL Arnd Bergmann
2010-06-01 20:52 ` [PATCH 05/31] rocket: kill BKL Arnd Bergmann
2010-06-01 20:52 ` [PATCH 06/31] synclink: kill the big kernel lock Arnd Bergmann
2010-06-01 20:52 ` [PATCH 07/31] cyclades: Kill off BKL usage Arnd Bergmann
2010-06-01 20:52 ` [PATCH 08/31] epca: Kill the big kernel lock Arnd Bergmann
2010-06-01 20:52 ` [PATCH 09/31] specialix; Kill the BKL Arnd Bergmann
2010-06-01 20:52 ` [PATCH 10/31] synclink: reworking locking a bit Arnd Bergmann
2010-06-01 20:52 ` [PATCH 11/31] tty: serial - fix various misuses/mishandlings of port->tty Arnd Bergmann
2010-06-01 20:52 ` Arnd Bergmann [this message]
2010-06-17 18:50 ` [PATCH 12/31] tty: serial - fix tty back references in termios Tony Luck
2010-06-17 20:21 ` Greg KH
2010-06-01 20:52 ` [PATCH 13/31] tty: serial - fix tty referencing in set_ldisc Arnd Bergmann
2010-06-01 20:52 ` [PATCH 14/31] vc: Locking clean up Arnd Bergmann
2010-06-01 20:52 ` [PATCH 15/31] tty: Make vt's have a tty_port Arnd Bergmann
2010-06-01 20:52 ` [PATCH 16/31] tty: Move the vt_tty field from the vc_data into the standard tty_port Arnd Bergmann
2010-06-01 20:52 ` [PATCH 17/31] serial: Change the wait for carrier locking Arnd Bergmann
2010-06-01 20:52 ` [PATCH 18/31] serial: add port helpers Arnd Bergmann
2010-06-01 20:52 ` [PATCH 19/31] serial: trim locking on the helpers Arnd Bergmann
2010-06-01 20:53 ` [PATCH 20/31] serial: Use block_til_ready helper Arnd Bergmann
2010-06-01 20:53 ` [PATCH 21/31] tty: replace BKL with a new tty_lock Arnd Bergmann
2010-06-01 20:53 ` [PATCH 22/31] tty: never hold BTM while getting tty_mutex Arnd Bergmann
2010-06-01 20:53 ` [PATCH 23/31] tty: fix console_sem lock order Arnd Bergmann
2010-06-01 20:53 ` [PATCH 24/31] cdc-acm: remove dead code Arnd Bergmann
2010-06-01 20:53 ` [PATCH 25/31] tty: introduce wait_event_interruptible_tty Arnd Bergmann
2010-06-01 20:53 ` [PATCH 26/31] tty: reorder ldisc locking Arnd Bergmann
2010-06-01 20:53 ` [PATCH 27/31] tty: untangle locking of wait_until_sent Arnd Bergmann
2010-06-01 20:53 ` [PATCH 28/31] tty: remove tty_lock_nested Arnd Bergmann
2010-06-01 20:53 ` [PATCH 29/31] tty: implement BTM as mutex instead of BKL Arnd Bergmann
2010-06-01 20:53 ` [PATCH 30/31] tty: release BTM while sleeping in block_til_ready Arnd Bergmann
2010-06-01 20:53 ` [PATCH 31/31] 8250: fix set_ldisc operation Arnd Bergmann
2010-06-02 22:16 ` [PATCH 00/31] tty: BKL removal Arnd Bergmann
2010-06-02 23:10 ` Greg KH
2010-06-16 20:49 ` Greg KH
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=1275425591-8803-13-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=alan@linux.intel.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=fweisbec@gmail.com \
--cc=gregkh@suse.de \
--cc=jkacur@redhat.com \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®