From: Sasha Levin <sashal@kernel.org> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin <sashal@kernel.org>, linuxppc-dev@lists.ozlabs.org, Jiri Slaby <jslaby@suse.cz>, Greg Kroah-Hartman <gregkh@linuxfoundation.org> Subject: [PATCH AUTOSEL 4.9 23/48] hvsi: don't panic on tty_register_driver failure Date: Thu, 9 Sep 2021 07:59:50 -0400 [thread overview] Message-ID: <20210909120015.150411-23-sashal@kernel.org> (raw) In-Reply-To: <20210909120015.150411-1-sashal@kernel.org> From: Jiri Slaby <jslaby@suse.cz> [ Upstream commit 7ccbdcc4d08a6d7041e4849219bbb12ffa45db4c ] The alloc_tty_driver failure is handled gracefully in hvsi_init. But tty_register_driver is not. panic is called if that one fails. So handle the failure of tty_register_driver gracefully too. This will keep at least the console functional as it was enabled earlier by console_initcall in hvsi_console_init. Instead of shooting down the whole system. This means, we disable interrupts and restore hvsi_wait back to poll_for_state(). Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Jiri Slaby <jslaby@suse.cz> Link: https://lore.kernel.org/r/20210723074317.32690-3-jslaby@suse.cz Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/tty/hvc/hvsi.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c index 96ce6bd1cc6f..4b6f93067ae4 100644 --- a/drivers/tty/hvc/hvsi.c +++ b/drivers/tty/hvc/hvsi.c @@ -1051,7 +1051,7 @@ static const struct tty_operations hvsi_ops = { static int __init hvsi_init(void) { - int i; + int i, ret; hvsi_driver = alloc_tty_driver(hvsi_count); if (!hvsi_driver) @@ -1082,12 +1082,25 @@ static int __init hvsi_init(void) } hvsi_wait = wait_for_state; /* irqs active now */ - if (tty_register_driver(hvsi_driver)) - panic("Couldn't register hvsi console driver\n"); + ret = tty_register_driver(hvsi_driver); + if (ret) { + pr_err("Couldn't register hvsi console driver\n"); + goto err_free_irq; + } printk(KERN_DEBUG "HVSI: registered %i devices\n", hvsi_count); return 0; +err_free_irq: + hvsi_wait = poll_for_state; + for (i = 0; i < hvsi_count; i++) { + struct hvsi_struct *hp = &hvsi_ports[i]; + + free_irq(hp->virq, hp); + } + tty_driver_kref_put(hvsi_driver); + + return ret; } device_initcall(hvsi_init); -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Sasha Levin <sashal@kernel.org> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jiri Slaby <jslaby@suse.cz>, linuxppc-dev@lists.ozlabs.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Sasha Levin <sashal@kernel.org> Subject: [PATCH AUTOSEL 4.9 23/48] hvsi: don't panic on tty_register_driver failure Date: Thu, 9 Sep 2021 07:59:50 -0400 [thread overview] Message-ID: <20210909120015.150411-23-sashal@kernel.org> (raw) In-Reply-To: <20210909120015.150411-1-sashal@kernel.org> From: Jiri Slaby <jslaby@suse.cz> [ Upstream commit 7ccbdcc4d08a6d7041e4849219bbb12ffa45db4c ] The alloc_tty_driver failure is handled gracefully in hvsi_init. But tty_register_driver is not. panic is called if that one fails. So handle the failure of tty_register_driver gracefully too. This will keep at least the console functional as it was enabled earlier by console_initcall in hvsi_console_init. Instead of shooting down the whole system. This means, we disable interrupts and restore hvsi_wait back to poll_for_state(). Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Jiri Slaby <jslaby@suse.cz> Link: https://lore.kernel.org/r/20210723074317.32690-3-jslaby@suse.cz Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/tty/hvc/hvsi.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c index 96ce6bd1cc6f..4b6f93067ae4 100644 --- a/drivers/tty/hvc/hvsi.c +++ b/drivers/tty/hvc/hvsi.c @@ -1051,7 +1051,7 @@ static const struct tty_operations hvsi_ops = { static int __init hvsi_init(void) { - int i; + int i, ret; hvsi_driver = alloc_tty_driver(hvsi_count); if (!hvsi_driver) @@ -1082,12 +1082,25 @@ static int __init hvsi_init(void) } hvsi_wait = wait_for_state; /* irqs active now */ - if (tty_register_driver(hvsi_driver)) - panic("Couldn't register hvsi console driver\n"); + ret = tty_register_driver(hvsi_driver); + if (ret) { + pr_err("Couldn't register hvsi console driver\n"); + goto err_free_irq; + } printk(KERN_DEBUG "HVSI: registered %i devices\n", hvsi_count); return 0; +err_free_irq: + hvsi_wait = poll_for_state; + for (i = 0; i < hvsi_count; i++) { + struct hvsi_struct *hp = &hvsi_ports[i]; + + free_irq(hp->virq, hp); + } + tty_driver_kref_put(hvsi_driver); + + return ret; } device_initcall(hvsi_init); -- 2.30.2
next prev parent reply other threads:[~2021-09-09 12:01 UTC|newest] Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-09 11:59 [PATCH AUTOSEL 4.9 01/48] crypto: mxs-dcp - Use sg_mapping_iter to copy data Sasha Levin 2021-09-09 11:59 ` Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 02/48] PCI: Use pci_update_current_state() in pci_enable_device_flags() Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 03/48] iio: dac: ad5624r: Fix incorrect handling of an optional regulator Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 04/48] video: fbdev: kyro: fix a DoS bug by restricting user input Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 05/48] netlink: Deal with ESRCH error in nlmsg_notify() Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 06/48] Smack: Fix wrong semantics in smk_access_entry() Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 07/48] usb: host: fotg210: fix the endpoint's transactional opportunities calculation Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 08/48] usb: host: fotg210: fix the actual_length of an iso packet Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 09/48] usb: gadget: u_ether: fix a potential null pointer dereference Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 10/48] usb: gadget: composite: Allow bMaxPower=0 if self-powered Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 11/48] staging: board: Fix uninitialized spinlock when attaching genpd Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 12/48] tty: serial: jsm: hold port lock when reporting modem line changes Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 13/48] bpf/tests: Fix copy-and-paste error in double word test Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 14/48] bpf/tests: Do not PASS tests without actually testing the result Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 15/48] video: fbdev: asiliantfb: Error out if 'pixclock' equals zero Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 16/48] video: fbdev: kyro: " Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 17/48] video: fbdev: riva: " Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 18/48] ipv4: ip_output.c: Fix out-of-bounds warning in ip_copy_addrs() Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 19/48] flow_dissector: Fix out-of-bounds warnings Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 20/48] s390/jump_label: print real address in a case of a jump label bug Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 21/48] serial: 8250: Define RX trigger levels for OxSemi 950 devices Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 22/48] xtensa: ISS: don't panic in rs_init Sasha Levin 2021-09-09 11:59 ` Sasha Levin [this message] 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 23/48] hvsi: don't panic on tty_register_driver failure Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 24/48] serial: 8250_pci: make setup_port() parameters explicitly unsigned Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 25/48] staging: ks7010: Fix the initialization of the 'sleep_status' structure Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 26/48] ata: sata_dwc_460ex: No need to call phy_exit() befre phy_init() Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 27/48] Bluetooth: skip invalid hci_sync_conn_complete_evt Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 28/48] ASoC: Intel: bytcr_rt5640: Move "Platform Clock" routes to the maps for the matching in-/output Sasha Levin 2021-09-09 11:59 ` Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 29/48] bpf: Fix off-by-one in tail call count limiting Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 30/48] net: ethernet: stmmac: Do not use unreachable() in ipq806x_gmac_probe() Sasha Levin 2021-09-09 11:59 ` Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 31/48] Bluetooth: avoid circular locks in sco_sock_connect Sasha Levin 2021-09-09 11:59 ` [PATCH AUTOSEL 4.9 32/48] gpu: drm: amd: amdgpu: amdgpu_i2c: fix possible uninitialized-variable access in amdgpu_i2c_router_select_ddc_port() Sasha Levin 2021-09-09 12:00 ` [PATCH AUTOSEL 4.9 33/48] ARM: tegra: tamonten: Fix UART pad setting Sasha Levin 2021-09-09 12:00 ` [PATCH AUTOSEL 4.9 34/48] ACPICA: iASL: Fix for WPBT table with no command-line arguments Sasha Levin 2021-09-09 12:00 ` [PATCH AUTOSEL 4.9 35/48] rpc: fix gss_svc_init cleanup on failure Sasha Levin 2021-09-09 12:00 ` [PATCH AUTOSEL 4.9 36/48] gfs2: Don't call dlm after protocol is unmounted Sasha Levin 2021-09-09 12:00 ` [Cluster-devel] " Sasha Levin 2021-09-09 12:00 ` [PATCH AUTOSEL 4.9 37/48] btrfs: subpage: check if there are compressed extents inside one page Sasha Levin 2021-09-09 13:01 ` David Sterba 2021-09-09 12:00 ` [PATCH AUTOSEL 4.9 38/48] btrfs: subpage: fix race between prepare_pages() and btrfs_releasepage() Sasha Levin 2021-09-09 13:01 ` David Sterba 2021-09-09 12:00 ` [PATCH AUTOSEL 4.9 39/48] ASoC: intel: atom: Revert PCM buffer address setup workaround again Sasha Levin 2021-09-09 12:07 ` Takashi Iwai 2021-09-09 12:07 ` Takashi Iwai 2021-09-09 12:00 ` [PATCH AUTOSEL 4.9 40/48] mmc: rtsx_pci: Fix long reads when clock is prescaled Sasha Levin 2021-09-09 12:00 ` [PATCH AUTOSEL 4.9 41/48] cifs: fix wrong release in sess_alloc_buffer() failed path Sasha Levin 2021-09-09 12:00 ` [PATCH AUTOSEL 4.9 42/48] Revert "USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set" Sasha Levin 2021-09-09 12:00 ` [PATCH AUTOSEL 4.9 43/48] usbip: give back URBs for unsent unlink requests during cleanup Sasha Levin 2021-09-09 12:00 ` [PATCH AUTOSEL 4.9 44/48] parport: remove non-zero check on count Sasha Levin 2021-09-09 12:00 ` [PATCH AUTOSEL 4.9 45/48] ath9k: fix OOB read ar9300_eeprom_restore_internal Sasha Levin 2021-09-09 12:00 ` [PATCH AUTOSEL 4.9 46/48] ath9k: fix sleeping in atomic context Sasha Levin 2021-09-09 12:00 ` [PATCH AUTOSEL 4.9 47/48] net: fix NULL pointer reference in cipso_v4_doi_free Sasha Levin 2021-09-09 12:00 ` [PATCH AUTOSEL 4.9 48/48] net: w5100: check return value after calling platform_get_resource() Sasha Levin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210909120015.150411-23-sashal@kernel.org \ --to=sashal@kernel.org \ --cc=gregkh@linuxfoundation.org \ --cc=jslaby@suse.cz \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=stable@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.