diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2021-05-25 20:51:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-27 15:20:02 +0200 |
| commit | 6ae7d0f5a92b9619f6e3c307ce56b2cefff3f0e9 (patch) | |
| tree | ff0b1843082a20f637007126ccac9379eaa9b208 /drivers/tty/nozomi.c | |
| parent | f2b0fe4b121e25bacdcfebd8a9dfd307b87142e7 (diff) | |
| download | lwn-6ae7d0f5a92b9619f6e3c307ce56b2cefff3f0e9.tar.gz lwn-6ae7d0f5a92b9619f6e3c307ce56b2cefff3f0e9.zip | |
tty: nozomi: Fix the error handling path of 'nozomi_card_init()'
The error handling path is broken and we may un-register things that have
never been registered.
Update the loops index accordingly.
Fixes: 9842c38e9176 ("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>
Diffstat (limited to 'drivers/tty/nozomi.c')
| -rw-r--r-- | drivers/tty/nozomi.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c index b85d4beabc1f..0c80f25c8c3d 100644 --- a/drivers/tty/nozomi.c +++ b/drivers/tty/nozomi.c @@ -1378,7 +1378,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); @@ -1416,13 +1416,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); |