net: hso: fix NULL-deref on disconnect regression
authorJohan Hovold <johan@kernel.org>
Mon, 26 Apr 2021 08:11:49 +0000 (10:11 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 26 Apr 2021 19:54:44 +0000 (12:54 -0700)
Commit 8a12f8836145 ("net: hso: fix null-ptr-deref during tty device
unregistration") fixed the racy minor allocation reported by syzbot, but
introduced an unconditional NULL-pointer dereference on every disconnect
instead.

Specifically, the serial device table must no longer be accessed after
the minor has been released by hso_serial_tty_unregister().

Fixes: 8a12f8836145 ("net: hso: fix null-ptr-deref during tty device unregistration")
Cc: stable@vger.kernel.org
Cc: Anirudh Rayabharam <mail@anirudhrb.com>
Reported-by: Leonardo Antoniazzi <leoanto@aruba.it>
Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Anirudh Rayabharam <mail@anirudhrb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/hso.c

index 9bc58e6..3ef4b28 100644 (file)
@@ -3104,7 +3104,7 @@ static void hso_free_interface(struct usb_interface *interface)
                        cancel_work_sync(&serial_table[i]->async_put_intf);
                        cancel_work_sync(&serial_table[i]->async_get_intf);
                        hso_serial_tty_unregister(serial);
-                       kref_put(&serial_table[i]->ref, hso_serial_ref_free);
+                       kref_put(&serial->parent->ref, hso_serial_ref_free);
                }
        }