From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 984F5C282C8 for ; Mon, 28 Jan 2019 12:20:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 72C322148E for ; Mon, 28 Jan 2019 12:20:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726848AbfA1MUc convert rfc822-to-8bit (ORCPT ); Mon, 28 Jan 2019 07:20:32 -0500 Received: from coyote.holtmann.net ([212.227.132.17]:44064 "EHLO mail.holtmann.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726682AbfA1MUc (ORCPT ); Mon, 28 Jan 2019 07:20:32 -0500 Received: from marcel-macpro.fritz.box (p4FF9FD60.dip0.t-ipconnect.de [79.249.253.96]) by mail.holtmann.org (Postfix) with ESMTPSA id B623DCF2B6; Mon, 28 Jan 2019 13:28:19 +0100 (CET) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 12.2 \(3445.102.3\)) Subject: Re: [PATCH] Bluetooth: hci_uart: Switch pty driver to slave side in tty_set_termios() From: Marcel Holtmann In-Reply-To: <20190128065259.GA2976@myunghoj-Precision-5530> Date: Mon, 28 Jan 2019 13:20:30 +0100 Cc: Johan Hedberg , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8BIT Message-Id: <1D2D84AB-CE67-435E-9F50-3A81A7A008C1@holtmann.org> References: <20190128065259.GA2976@myunghoj-Precision-5530> To: Myungho Jung X-Mailer: Apple Mail (2.3445.102.3) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Myungho, > tty_set_termios() should be called with slave side of pty driver. So, If > tty driver is pty master, it needs to be switched to ->link. > > Reported-by: syzbot+a950165cbb86bdd023a4@syzkaller.appspotmail.com > Signed-off-by: Myungho Jung > --- > drivers/bluetooth/hci_ldisc.c | 20 +++++++++++++++----- > 1 file changed, 15 insertions(+), 5 deletions(-) > > diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c > index fbf7b4df23ab..90c5ea8c399b 100644 > --- a/drivers/bluetooth/hci_ldisc.c > +++ b/drivers/bluetooth/hci_ldisc.c > @@ -299,10 +299,18 @@ static int hci_uart_send_frame(struct hci_dev *hdev, struct sk_buff *skb) > return 0; > } > > +/* If driver is pty master, return slave side */ > +static struct tty_struct *hci_uart_get_real_tty(struct tty_struct *tty) > +{ > + return (tty->driver->type == TTY_DRIVER_TYPE_PTY && > + tty->driver->subtype == PTY_TYPE_MASTER) ? tty->link : tty; > +} > + if (tty->driver->type == TTY_DRIVER_PTY && tty->driver->subtype = PTY_TYPE_MASTER) return tty->link; return tty; We can spare the extra two lines to make this readable. > /* Flow control or un-flow control the device */ > void hci_uart_set_flow_control(struct hci_uart *hu, bool enable) > { > struct tty_struct *tty = hu->tty; > + struct tty_struct *real_tty; > struct ktermios ktermios; > int status; > unsigned int set = 0; > @@ -314,11 +322,12 @@ void hci_uart_set_flow_control(struct hci_uart *hu, bool enable) > return; > } > > + real_tty = hci_uart_get_real_tty(tty); I would add a comment above this call why this is done and then also add an empty line after it. The if clause is not related to that call at all. > if (enable) { > /* Disable hardware flow control */ > - ktermios = tty->termios; > + ktermios = real_tty->termios; > ktermios.c_cflag &= ~CRTSCTS; > - status = tty_set_termios(tty, &ktermios); > + status = tty_set_termios(real_tty, &ktermios); > BT_DBG("Disabling hardware flow control: %s", > status ? "failed" : "success"); > > @@ -350,9 +359,9 @@ void hci_uart_set_flow_control(struct hci_uart *hu, bool enable) > BT_DBG("Setting RTS: %s", status ? "failed" : "success"); > > /* Re-enable hardware flow control */ > - ktermios = tty->termios; > + ktermios = real_tty->termios; > ktermios.c_cflag |= CRTSCTS; > - status = tty_set_termios(tty, &ktermios); > + status = tty_set_termios(real_tty, &ktermios); > BT_DBG("Enabling hardware flow control: %s", > status ? "failed" : "success"); > } > @@ -367,9 +376,10 @@ void hci_uart_set_speeds(struct hci_uart *hu, unsigned int init_speed, > > void hci_uart_set_baudrate(struct hci_uart *hu, unsigned int speed) > { > - struct tty_struct *tty = hu->tty; > + struct tty_struct *tty; > struct ktermios ktermios; > > + tty = hci_uart_get_real_tty(hu->tty); Same here. Add comment above and the also an extra empty line. > ktermios = tty->termios; > ktermios.c_cflag &= ~CBAUD; > tty_termios_encode_baud_rate(&ktermios, speed, speed); Regards Marcel