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.14 32/65] USB: serial: io_edgeport: handle unbound ports on URB completion
    Date
    From: Johan Hovold <johan@kernel.org>

    [ Upstream commit e37d1aeda737a20b1846a91a3da3f8b0f00cf690 ]

    Check for NULL port data in the shared interrupt and bulk completion
    callbacks to avoid dereferencing a NULL pointer in case a device sends
    data for a port device which isn't bound to a driver (e.g. due to a
    malicious device having unexpected endpoints or after an allocation
    failure on port probe).

    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/io_edgeport.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
    index 8810de817095..3705b64ab948 100644
    --- a/drivers/usb/serial/io_edgeport.c
    +++ b/drivers/usb/serial/io_edgeport.c
    @@ -720,7 +720,7 @@ static void edge_interrupt_callback(struct urb *urb)
    if (txCredits) {
    port = edge_serial->serial->port[portNumber];
    edge_port = usb_get_serial_port_data(port);
    - if (edge_port->open) {
    + if (edge_port && edge_port->open) {
    spin_lock_irqsave(&edge_port->ep_lock,
    flags);
    edge_port->txCredits += txCredits;
    @@ -1847,7 +1847,7 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial,
    if (rxLen && edge_serial->rxPort < serial->num_ports) {
    port = serial->port[edge_serial->rxPort];
    edge_port = usb_get_serial_port_data(port);
    - if (edge_port->open) {
    + if (edge_port && edge_port->open) {
    dev_dbg(dev, "%s - Sending %d bytes to TTY for port %d\n",
    __func__, rxLen,
    edge_serial->rxPort);
    --
    2.20.1


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