From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753494Ab2I0Rkq (ORCPT ); Thu, 27 Sep 2012 13:40:46 -0400 Received: from mail-la0-f46.google.com ([209.85.215.46]:37220 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752386Ab2I0Rkp (ORCPT ); Thu, 27 Sep 2012 13:40:45 -0400 Date: Thu, 27 Sep 2012 21:40:40 +0400 From: Cyrill Gorcunov To: Jiri Slaby Cc: linux-kernel@vger.kernel.org, alan@lxorguk.ukuu.org.uk, hpa@zytor.com, gregkh@linuxfoundation.org, xemul@parallels.com Subject: Re: [patch 1/2] tty: pty - Move TIOCPKT handling into pty.c Message-ID: <20120927174040.GR6618@moon> References: <20120927165958.287690622@openvz.org> <20120927170137.722717394@openvz.org> <50648DE7.2060904@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <50648DE7.2060904@suse.cz> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Sep 27, 2012 at 07:33:27PM +0200, Jiri Slaby wrote: > > + > > + if (tty->driver->subtype != PTY_TYPE_MASTER) > > + return -ENOTTY; > > Hi! > > This check is not needed as the ioctls are master-only. Here is updated version, thanks! --- From: Cyrill Gorcunov Subject: tty: pty - Move TIOCPKT handling into pty.c Since this ioctl is for pty devices only move it to pty.c. v2: - drop PTY_TYPE_MASTER test since it's master peer ioctl anyway (by jslaby@) Suggested-by: Alan Cox Signed-off-by: Cyrill Gorcunov CC: "H. Peter Anvin" CC: Greg Kroah-Hartman CC: Pavel Emelyanov CC: Jiri Slaby --- drivers/tty/pty.c | 26 ++++++++++++++++++++++++++ drivers/tty/tty_ioctl.c | 20 -------------------- 2 files changed, 26 insertions(+), 20 deletions(-) Index: tty.git/drivers/tty/pty.c =================================================================== --- tty.git.orig/drivers/tty/pty.c +++ tty.git/drivers/tty/pty.c @@ -174,6 +174,28 @@ static int pty_set_lock(struct tty_struc return 0; } +/* Set the packet mode on a pty */ +static int pty_set_pktmode(struct tty_struct *tty, int __user *arg) +{ + unsigned long flags; + int pktmode; + + if (get_user(pktmode, arg)) + return -EFAULT; + + spin_lock_irqsave(&tty->ctrl_lock, flags); + if (pktmode) { + if (!tty->packet) { + tty->packet = 1; + tty->link->ctrl_status = 0; + } + } else + tty->packet = 0; + spin_unlock_irqrestore(&tty->ctrl_lock, flags); + + return 0; +} + /* Send a signal to the slave */ static int pty_signal(struct tty_struct *tty, int sig) { @@ -393,6 +415,8 @@ static int pty_bsd_ioctl(struct tty_stru switch (cmd) { case TIOCSPTLCK: /* Set PT Lock (disallow slave open) */ return pty_set_lock(tty, (int __user *) arg); + case TIOCPKT: /* Set PT packet mode */ + return pty_set_pktmode(tty, (int __user *)arg); case TIOCSIG: /* Send signal to other side of pty */ return pty_signal(tty, (int) arg); } @@ -507,6 +531,8 @@ static int pty_unix98_ioctl(struct tty_s switch (cmd) { case TIOCSPTLCK: /* Set PT Lock (disallow slave open) */ return pty_set_lock(tty, (int __user *)arg); + case TIOCPKT: /* Set PT packet mode */ + return pty_set_pktmode(tty, (int __user *)arg); case TIOCGPTN: /* Get PT Number */ return put_user(tty->index, (unsigned int __user *)arg); case TIOCSIG: /* Send signal to other side of pty */ Index: tty.git/drivers/tty/tty_ioctl.c =================================================================== --- tty.git.orig/drivers/tty/tty_ioctl.c +++ tty.git/drivers/tty/tty_ioctl.c @@ -1153,26 +1153,6 @@ int n_tty_ioctl_helper(struct tty_struct return 0; case TCFLSH: return tty_perform_flush(tty, arg); - case TIOCPKT: - { - int pktmode; - - if (tty->driver->type != TTY_DRIVER_TYPE_PTY || - tty->driver->subtype != PTY_TYPE_MASTER) - return -ENOTTY; - if (get_user(pktmode, (int __user *) arg)) - return -EFAULT; - spin_lock_irqsave(&tty->ctrl_lock, flags); - if (pktmode) { - if (!tty->packet) { - tty->packet = 1; - tty->link->ctrl_status = 0; - } - } else - tty->packet = 0; - spin_unlock_irqrestore(&tty->ctrl_lock, flags); - return 0; - } default: /* Try the mode commands */ return tty_mode_ioctl(tty, file, cmd, arg);