iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: fwserial: Fix error handling in fwserial_create

Browse Source 
[ Upstream commit f31559af97 ]

When fw_core_add_address_handler() fails, we need to destroy
the port by tty_port_destroy(). Also we need to unregister
the address handler by fw_core_remove_address_handler() on
failure.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Link: https://lore.kernel.org/r/20201221122437.10274-1-dinghao.liu@zju.edu.cn
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dinghao Liu
2020-12-21 20:24:35 +08:00
committed by Greg Kroah-Hartman
parent a03583775a
commit b3854d1550
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/fwserial/fwserial.c
View File

@ -2189,6 +2189,7 @@ static int fwserial_create(struct fw_unit *unit)
err = fw_core_add_address_handler(&port->rx_handler, err = fw_core_add_address_handler(&port->rx_handler,
&fw_high_memory_region); &fw_high_memory_region);
if (err) { if (err) {
tty_port_destroy(&port->port);
kfree(port); kfree(port);
goto free_ports; goto free_ports;
} }
@ -2271,6 +2272,7 @@ unregister_ttys:
free_ports: free_ports:
for (--i; i >= 0; --i) { for (--i; i >= 0; --i) {
fw_core_remove_address_handler(&serial->ports[i]->rx_handler);
tty_port_destroy(&serial->ports[i]->port); tty_port_destroy(&serial->ports[i]->port);
kfree(serial->ports[i]); kfree(serial->ports[i]);
} }