lkml.org 
[lkml]   [2015]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 12/29] USB: symbolserial: Use usb_get_serial_port_data
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Philipp Hachtmann <hachti@hachti.de>

    commit 951d3793bbfc0a441d791d820183aa3085c83ea9 upstream.

    The driver used usb_get_serial_data(port->serial) which compiled but resulted
    in a NULL pointer being returned (and subsequently used). I did not go deeper
    into this but I guess this is a regression.

    Signed-off-by: Philipp Hachtmann <hachti@hachti.de>
    Fixes: a85796ee5149 ("USB: symbolserial: move private-data allocation to
    port_probe")
    Acked-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/serial/symbolserial.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/usb/serial/symbolserial.c
    +++ b/drivers/usb/serial/symbolserial.c
    @@ -96,7 +96,7 @@ exit:

    static int symbol_open(struct tty_struct *tty, struct usb_serial_port *port)
    {
    - struct symbol_private *priv = usb_get_serial_data(port->serial);
    + struct symbol_private *priv = usb_get_serial_port_data(port);
    unsigned long flags;
    int result = 0;

    @@ -122,7 +122,7 @@ static void symbol_close(struct usb_seri
    static void symbol_throttle(struct tty_struct *tty)
    {
    struct usb_serial_port *port = tty->driver_data;
    - struct symbol_private *priv = usb_get_serial_data(port->serial);
    + struct symbol_private *priv = usb_get_serial_port_data(port);

    spin_lock_irq(&priv->lock);
    priv->throttled = true;
    @@ -132,7 +132,7 @@ static void symbol_throttle(struct tty_s
    static void symbol_unthrottle(struct tty_struct *tty)
    {
    struct usb_serial_port *port = tty->driver_data;
    - struct symbol_private *priv = usb_get_serial_data(port->serial);
    + struct symbol_private *priv = usb_get_serial_port_data(port);
    int result;
    bool was_throttled;




    \
     
     \ /
      Last update: 2015-09-19 21:01    [W:4.079 / U:0.536 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site