lkml.org 
[lkml]   [2017]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 138/178] serdev: ttyport: enforce tty-driver open() requirement
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johan Hovold <johan@kernel.org>


    [ Upstream commit dee7d0f3b200c67c6ee96bd37c6e8fa52690ab56 ]

    The tty-driver open routine is mandatory, but the serdev
    tty-port-controller implementation did not treat it as such and would
    instead fall back to calling tty_port_open() directly.

    Signed-off-by: Johan Hovold <johan@kernel.org>
    Acked-by: Rob Herring <robh@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/tty/serdev/serdev-ttyport.c | 14 ++++++++++----
    1 file changed, 10 insertions(+), 4 deletions(-)

    --- a/drivers/tty/serdev/serdev-ttyport.c
    +++ b/drivers/tty/serdev/serdev-ttyport.c
    @@ -120,10 +120,10 @@ static int ttyport_open(struct serdev_co
    return PTR_ERR(tty);
    serport->tty = tty;

    - if (tty->ops->open)
    - tty->ops->open(serport->tty, NULL);
    - else
    - tty_port_open(serport->port, tty, NULL);
    + if (!tty->ops->open)
    + goto err_unlock;
    +
    + tty->ops->open(serport->tty, NULL);

    /* Bring the UART into a known 8 bits no parity hw fc state */
    ktermios = tty->termios;
    @@ -140,6 +140,12 @@ static int ttyport_open(struct serdev_co

    tty_unlock(serport->tty);
    return 0;
    +
    +err_unlock:
    + tty_unlock(tty);
    + tty_release_struct(tty, serport->tty_idx);
    +
    + return -ENODEV;
    }

    static void ttyport_close(struct serdev_controller *ctrl)

    \
     
     \ /
      Last update: 2017-12-18 17:30    [W:3.008 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site