mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
tty: nozomi: Fix the error handling path of 'nozomi_card_init()'
[ Upstream commit6ae7d0f5a9
] The error handling path is broken and we may un-register things that have never been registered. Update the loops index accordingly. Fixes:9842c38e91
("kfifo: fix warn_unused_result") Suggested-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Link: https://lore.kernel.org/r/e28c2e92c7475da25b03d022ea2d6dcf1ba807a2.1621968629.git.christophe.jaillet@wanadoo.fr Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
7f0b77542e
commit
329e02d6f2
1 changed files with 5 additions and 3 deletions
|
@ -1395,7 +1395,7 @@ static int nozomi_card_init(struct pci_dev *pdev,
|
|||
NOZOMI_NAME, dc);
|
||||
if (unlikely(ret)) {
|
||||
dev_err(&pdev->dev, "can't request irq %d\n", pdev->irq);
|
||||
goto err_free_kfifo;
|
||||
goto err_free_all_kfifo;
|
||||
}
|
||||
|
||||
DBG1("base_addr: %p", dc->base_addr);
|
||||
|
@ -1433,13 +1433,15 @@ static int nozomi_card_init(struct pci_dev *pdev,
|
|||
return 0;
|
||||
|
||||
err_free_tty:
|
||||
for (i = 0; i < MAX_PORT; ++i) {
|
||||
for (i--; i >= 0; i--) {
|
||||
tty_unregister_device(ntty_driver, dc->index_start + i);
|
||||
tty_port_destroy(&dc->port[i].port);
|
||||
}
|
||||
free_irq(pdev->irq, dc);
|
||||
err_free_all_kfifo:
|
||||
i = MAX_PORT;
|
||||
err_free_kfifo:
|
||||
for (i = 0; i < MAX_PORT; i++)
|
||||
for (i--; i >= PORT_MDM; i--)
|
||||
kfifo_free(&dc->port[i].fifo_ul);
|
||||
err_free_sbuf:
|
||||
kfree(dc->send_buf);
|
||||
|
|
Loading…
Reference in a new issue