usb: hso: check for return value in hso_serial_common_create()
authorRustam Kovhaev <rkovhaev@gmail.com>
Tue, 28 Jul 2020 06:42:17 +0000 (23:42 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Aug 2020 13:32:33 +0000 (15:32 +0200)
[ Upstream commit e911e99a0770f760377c263bc7bac1b1593c6147 ]

in case of an error tty_register_device_attr() returns ERR_PTR(),
add IS_ERR() check

Reported-and-tested-by: syzbot+67b2bd0e34f952d0321e@syzkaller.appspotmail.com
Link: https://syzkaller.appspot.com/bug?extid=67b2bd0e34f952d0321e
Signed-off-by: Rustam Kovhaev <rkovhaev@gmail.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/usb/hso.c

index 61b9d33681484d7cb79d3e617d78cf44580d8d40..bff268b4a9a460e70bf7162203acd64b3356b45d 100644 (file)
@@ -2274,12 +2274,14 @@ static int hso_serial_common_create(struct hso_serial *serial, int num_urbs,
 
        minor = get_free_serial_index();
        if (minor < 0)
-               goto exit;
+               goto exit2;
 
        /* register our minor number */
        serial->parent->dev = tty_port_register_device_attr(&serial->port,
                        tty_drv, minor, &serial->parent->interface->dev,
                        serial->parent, hso_serial_dev_groups);
+       if (IS_ERR(serial->parent->dev))
+               goto exit2;
 
        /* fill in specific data for later use */
        serial->minor = minor;
@@ -2324,6 +2326,7 @@ static int hso_serial_common_create(struct hso_serial *serial, int num_urbs,
        return 0;
 exit:
        hso_serial_tty_unregister(serial);
+exit2:
        hso_serial_common_free(serial);
        return -1;
 }