Commit dc7c9de1 authored by Rustam Kovhaev's avatar Rustam Kovhaev Committed by Liu Jian
Browse files

usb: hso: check for return value in hso_serial_common_create() 

stable inclusion
from stable-v4.19.139
commit a46691bb7cc2686934748c8b33e4b9f5dc936aeb
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I93LMH
CVE: CVE-2021-46904

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a46691bb7cc2686934748c8b33e4b9f5dc936aeb



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

[ Upstream commit e911e99a ]

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

Reported-and-tested-by: default avatar <syzbot+67b2bd0e34f952d0321e@syzkaller.appspotmail.com>
Link: https://syzkaller.appspot.com/bug?extid=67b2bd0e34f952d0321e


Signed-off-by: default avatarRustam Kovhaev <rkovhaev@gmail.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarLiu Jian <liujian56@huawei.com>
parent b97b6350

drivers/net/usb/hso.c

+4 −1
Original line number Diff line number Diff line
@@ -2273,12 +2273,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;
@@ -2323,6 +2325,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;

}