lkml.org 
[lkml]   [2020]   [Jan]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 73/97] USB: serial: keyspan: handle unbound ports
    Date
    From: Johan Hovold <johan@kernel.org>

    [ Upstream commit 3018dd3fa114b13261e9599ddb5656ef97a1fa17 ]

    Check for NULL port data in the control URB completion handlers to avoid
    dereferencing a NULL pointer in the unlikely case where a port device
    isn't bound to a driver (e.g. after an allocation failure on port
    probe()).

    Fixes: 0ca1268e109a ("USB Serial Keyspan: add support for USA-49WG & USA-28XG")
    Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
    Cc: stable <stable@vger.kernel.org>
    Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/usb/serial/keyspan.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
    index 185ef1d8c6cd..e08755e9b612 100644
    --- a/drivers/usb/serial/keyspan.c
    +++ b/drivers/usb/serial/keyspan.c
    @@ -567,6 +567,8 @@ static void usa49_glocont_callback(struct urb *urb)
    for (i = 0; i < serial->num_ports; ++i) {
    port = serial->port[i];
    p_priv = usb_get_serial_port_data(port);
    + if (!p_priv)
    + continue;

    if (p_priv->resend_cont) {
    dev_dbg(&port->dev, "%s - sending setup\n", __func__);
    @@ -968,6 +970,8 @@ static void usa67_glocont_callback(struct urb *urb)
    for (i = 0; i < serial->num_ports; ++i) {
    port = serial->port[i];
    p_priv = usb_get_serial_port_data(port);
    + if (!p_priv)
    + continue;

    if (p_priv->resend_cont) {
    dev_dbg(&port->dev, "%s - sending setup\n", __func__);
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-22 10:52    [W:4.698 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site