From: Al Viro <viro@ZenIV.linux.org.uk>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 10/50] cyclades: switch to ->[sg]et_serial()
Date: Thu, 13 Sep 2018 03:40:09 +0100 [thread overview]
Message-ID: <20180913024049.24567-10-viro@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20180913024049.24567-1-viro@ZenIV.linux.org.uk>
From: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
drivers/tty/cyclades.c | 77 ++++++++++++++++++++++++--------------------------
1 file changed, 37 insertions(+), 40 deletions(-)
diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
index 6d3c58051ce3..4562c8060d09 100644
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -2257,44 +2257,45 @@ static void cy_set_line_char(struct cyclades_port *info, struct tty_struct *tty)
}
} /* set_line_char */
-static int cy_get_serial_info(struct cyclades_port *info,
- struct serial_struct __user *retinfo)
+static int cy_get_serial_info(struct tty_struct *tty,
+ struct serial_struct *ss)
{
+ struct cyclades_port *info = tty->driver_data;
struct cyclades_card *cinfo = info->card;
- struct serial_struct tmp = {
- .type = info->type,
- .line = info->line,
- .port = (info->card - cy_card) * 0x100 + info->line -
- cinfo->first_line,
- .irq = cinfo->irq,
- .flags = info->port.flags,
- .close_delay = info->port.close_delay,
- .closing_wait = info->port.closing_wait,
- .baud_base = info->baud,
- .custom_divisor = info->custom_divisor,
- };
- return copy_to_user(retinfo, &tmp, sizeof(*retinfo)) ? -EFAULT : 0;
+
+ if (serial_paranoia_check(info, tty->name, "cy_ioctl"))
+ return -ENODEV;
+ ss->type = info->type;
+ ss->line = info->line;
+ ss->port = (info->card - cy_card) * 0x100 + info->line -
+ cinfo->first_line;
+ ss->irq = cinfo->irq;
+ ss->flags = info->port.flags;
+ ss->close_delay = info->port.close_delay;
+ ss->closing_wait = info->port.closing_wait;
+ ss->baud_base = info->baud;
+ ss->custom_divisor = info->custom_divisor;
+ return 0;
}
-static int
-cy_set_serial_info(struct cyclades_port *info, struct tty_struct *tty,
- struct serial_struct __user *new_info)
+static int cy_set_serial_info(struct tty_struct *tty,
+ struct serial_struct *ss)
{
- struct serial_struct new_serial;
+ struct cyclades_port *info = tty->driver_data;
int old_flags;
int ret;
- if (copy_from_user(&new_serial, new_info, sizeof(new_serial)))
- return -EFAULT;
+ if (serial_paranoia_check(info, tty->name, "cy_ioctl"))
+ return -ENODEV;
mutex_lock(&info->port.mutex);
old_flags = info->port.flags;
if (!capable(CAP_SYS_ADMIN)) {
- if (new_serial.close_delay != info->port.close_delay ||
- new_serial.baud_base != info->baud ||
- (new_serial.flags & ASYNC_FLAGS &
+ if (ss->close_delay != info->port.close_delay ||
+ ss->baud_base != info->baud ||
+ (ss->flags & ASYNC_FLAGS &
~ASYNC_USR_MASK) !=
(info->port.flags & ASYNC_FLAGS & ~ASYNC_USR_MASK))
{
@@ -2302,9 +2303,9 @@ cy_set_serial_info(struct cyclades_port *info, struct tty_struct *tty,
return -EPERM;
}
info->port.flags = (info->port.flags & ~ASYNC_USR_MASK) |
- (new_serial.flags & ASYNC_USR_MASK);
- info->baud = new_serial.baud_base;
- info->custom_divisor = new_serial.custom_divisor;
+ (ss->flags & ASYNC_USR_MASK);
+ info->baud = ss->baud_base;
+ info->custom_divisor = ss->custom_divisor;
goto check_and_exit;
}
@@ -2313,18 +2314,18 @@ cy_set_serial_info(struct cyclades_port *info, struct tty_struct *tty,
* At this point, we start making changes.....
*/
- info->baud = new_serial.baud_base;
- info->custom_divisor = new_serial.custom_divisor;
+ info->baud = ss->baud_base;
+ info->custom_divisor = ss->custom_divisor;
info->port.flags = (info->port.flags & ~ASYNC_FLAGS) |
- (new_serial.flags & ASYNC_FLAGS);
- info->port.close_delay = new_serial.close_delay * HZ / 100;
- info->port.closing_wait = new_serial.closing_wait * HZ / 100;
+ (ss->flags & ASYNC_FLAGS);
+ info->port.close_delay = ss->close_delay * HZ / 100;
+ info->port.closing_wait = ss->closing_wait * HZ / 100;
check_and_exit:
if (tty_port_initialized(&info->port)) {
- if ((new_serial.flags ^ old_flags) & ASYNC_SPD_MASK) {
+ if ((ss->flags ^ old_flags) & ASYNC_SPD_MASK) {
/* warn about deprecation unless clearing */
- if (new_serial.flags & ASYNC_SPD_MASK)
+ if (ss->flags & ASYNC_SPD_MASK)
dev_warn_ratelimited(tty->dev, "use of SPD flags is deprecated\n");
}
cy_set_line_char(info, tty);
@@ -2698,12 +2699,6 @@ cy_ioctl(struct tty_struct *tty,
case CYGETWAIT:
ret_val = info->port.closing_wait / (HZ / 100);
break;
- case TIOCGSERIAL:
- ret_val = cy_get_serial_info(info, argp);
- break;
- case TIOCSSERIAL:
- ret_val = cy_set_serial_info(info, tty, argp);
- break;
case TIOCSERGETLSR: /* Get line status register */
ret_val = get_lsr_info(info, argp);
break;
@@ -4011,6 +4006,8 @@ static const struct tty_operations cy_ops = {
.tiocmget = cy_tiocmget,
.tiocmset = cy_tiocmset,
.get_icount = cy_get_icount,
+ .set_serial = cy_set_serial_info,
+ .get_serial = cy_get_serial_info,
.proc_show = cyclades_proc_show,
};
--
2.11.0
next prev parent reply other threads:[~2018-09-13 2:44 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-13 2:31 [PATCHES] tty ioctls cleanups, compat and not only Al Viro
2018-09-13 2:40 ` [PATCH 01/50] presence of RS485 ioctls has been unconditional since 2014 Al Viro
2018-09-13 2:40 ` [PATCH 02/50] move compat handling of tty ioctls to tty_compat_ioctl() Al Viro
2018-09-14 15:15 ` Arnd Bergmann
2018-09-14 18:16 ` gregkh
2018-09-14 19:38 ` Arnd Bergmann
2018-09-15 18:51 ` gregkh
2018-09-13 2:40 ` [PATCH 03/50] tty_ioctl(): drop FIONBIO handling Al Viro
2018-09-13 2:40 ` [PATCH 04/50] mos7720: bury dead TIOCM... in ->ioctl() Al Viro
2018-09-14 13:31 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 05/50] tty_ioctl(): start taking TIOC[SG]SERIAL into separate methods Al Viro
2018-09-14 13:22 ` Johan Hovold
2018-09-14 15:18 ` Al Viro
2018-09-14 16:23 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 06/50] simserial: switch to ->[sg]et_serial() Al Viro
2018-09-13 2:40 ` [PATCH 07/50] fwserial: " Al Viro
2018-09-13 2:40 ` [PATCH 08/50] greybus/uart: " Al Viro
2018-09-14 13:31 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 09/50] amiserial: " Al Viro
2018-09-13 10:33 ` Greg Kroah-Hartman
2018-10-11 17:58 ` Geert Uytterhoeven
2018-10-13 5:36 ` Al Viro
2018-09-13 2:40 ` Al Viro [this message]
2018-09-13 2:40 ` [PATCH 11/50] ipwireless: " Al Viro
2018-09-14 12:00 ` David Sterba
2018-09-13 2:40 ` [PATCH 12/50] isicom: " Al Viro
2018-09-13 2:40 ` [PATCH 13/50] moxa: " Al Viro
2018-09-13 2:40 ` [PATCH 14/50] mxser: " Al Viro
2018-09-13 2:40 ` [PATCH 15/50] serial_core: " Al Viro
2018-09-13 2:40 ` [PATCH 16/50] rfcomm: get rid of mentioning TIOC[SG]SERIAL Al Viro
2018-09-13 2:40 ` [PATCH 17/50] usb-serial: begin switching to ->[sg]et_serial() Al Viro
2018-09-14 13:39 ` Johan Hovold
2018-09-14 15:23 ` Al Viro
2018-09-14 15:26 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 18/50] cdc-acm: switch " Al Viro
2018-09-13 2:40 ` [PATCH 19/50] ark3116: switch to ->get_serial() Al Viro
2018-09-14 13:41 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 20/50] f81232: " Al Viro
2018-09-14 13:42 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 21/50] f81534: " Al Viro
2018-09-14 13:43 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 22/50] fdti_sio: switch to ->[sg]et_serial() Al Viro
2018-09-14 13:47 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 23/50] io_edgeport: switch to ->get_serial() Al Viro
2018-09-14 13:58 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 24/50] io_ti: " Al Viro
2018-09-14 13:59 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 25/50] mos7720: " Al Viro
2018-09-14 14:02 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 26/50] mos7840: " Al Viro
2018-09-14 14:07 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 27/50] opticon: " Al Viro
2018-09-14 14:08 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 28/50] pl2303: " Al Viro
2018-09-14 14:08 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 29/50] quatech2: " Al Viro
2018-09-14 14:09 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 30/50] ssu100: " Al Viro
2018-09-14 14:10 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 31/50] ti_usb_3410_5052: switch to ->[sg]et_serial() Al Viro
2018-09-14 14:12 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 32/50] whiteheat: switch to ->get_serial() Al Viro
2018-09-14 14:15 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 33/50] usb_wwan: switch to ->[sg]et_serial() Al Viro
2018-09-14 14:18 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 34/50] complete ->[sg]et_serial() switchover Al Viro
2018-09-14 14:20 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 35/50] synclink: reduce pointless checks in ->ioctl() Al Viro
2018-09-13 2:40 ` [PATCH 36/50] take compat TIOC[SG]SERIAL treatment into tty_compat_ioctl() Al Viro
2018-09-13 2:40 ` [PATCH 37/50] kill capinc_tty_ioctl() Al Viro
2018-09-13 2:40 ` [PATCH 38/50] isdn_tty: TCSBRK{,P} won't reach ->ioctl() Al Viro
2018-09-13 2:40 ` [PATCH 39/50] dgnc: TIOCM... " Al Viro
2018-09-13 2:40 ` [PATCH 40/50] kill the rest of tty COMPAT_IOCTL() entries Al Viro
2018-09-13 10:55 ` Arnd Bergmann
2018-09-13 2:40 ` [PATCH 41/50] dgnc: break-related ioctls won't reach ->ioctl() Al Viro
2018-09-13 11:59 ` Greg Kroah-Hartman
2018-09-13 2:40 ` [PATCH 42/50] remove fallback to drivers for TIOCGICOUNT Al Viro
2018-09-14 14:23 ` Johan Hovold
2018-09-13 2:40 ` [PATCH 43/50] dgnc: leave TIOC[GS]SOFTCAR to ldisc Al Viro
2018-09-13 2:40 ` [PATCH 44/50] dgnc: don't bother with (empty) stub for TCXONC Al Viro
2018-09-13 2:40 ` [PATCH 45/50] gigaset: don't try to printk userland buffer contents Al Viro
2018-09-13 2:40 ` [PATCH 46/50] vt_compat_ioctl(): clean up, use compat_ptr() properly Al Viro
2018-09-13 10:10 ` Arnd Bergmann
2018-09-13 2:40 ` [PATCH 47/50] gigaset: add ->compat_ioctl() Al Viro
2018-09-13 2:40 ` [PATCH 48/50] compat_ioctl - kill keyboard ioctl handling Al Viro
2018-09-13 2:40 ` [PATCH 49/50] pty: fix compat ioctls Al Viro
2018-09-13 2:40 ` [PATCH 50/50] synclink_gt(): fix compat_ioctl() Al Viro
2018-09-13 11:19 ` [PATCHES] tty ioctls cleanups, compat and not only Arnd Bergmann
2018-09-13 20:31 ` Al Viro
2018-09-13 20:56 ` Arnd Bergmann
2018-09-14 2:27 ` Al Viro
2018-09-14 8:21 ` Arnd Bergmann
2018-09-14 15:10 ` Al Viro
2018-09-14 15:33 ` Arnd Bergmann
2018-09-13 11:59 ` Greg Kroah-Hartman
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=20180913024049.24567-10-viro@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--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;
as well as URLs for NNTP newsgroup(s).