LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Johan Hovold <johan@kernel.org>, Sasha Levin <sashal@kernel.org>,
	linux-usb@vger.kernel.org
Subject: [PATCH AUTOSEL 5.0 067/317] USB: serial: fix initial-termios handling
Date: Wed, 22 May 2019 15:19:28 -0400	[thread overview]
Message-ID: <20190522192338.23715-67-sashal@kernel.org> (raw)
In-Reply-To: <20190522192338.23715-1-sashal@kernel.org>

From: Johan Hovold <johan@kernel.org>

[ Upstream commit 579bebe5dd522580019e7b10b07daaf500f9fb1e ]

The USB-serial driver init_termios callback is used to override the
default initial terminal settings provided by USB-serial core.

After a bug was fixed in the original implementation introduced by
commit fe1ae7fdd2ee ("tty: USB serial termios bits"), the init_termios
callback was no longer called just once on first use as intended but
rather on every (first) open.

This specifically meant that the terminal settings saved on (final)
close were ignored when reopening a port for drivers overriding the
initial settings.

Also update the outdated function header referring to the creation of
termios objects.

Fixes: 7e29bb4b779f ("usb-serial: fix termios initialization logic")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/usb/serial/usb-serial.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 7e89efbf2c284..676c296103a2f 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -164,9 +164,9 @@ void usb_serial_put(struct usb_serial *serial)
  * @driver: the driver (USB in our case)
  * @tty: the tty being created
  *
- * Create the termios objects for this tty.  We use the default
+ * Initialise the termios structure for this tty.  We use the default
  * USB serial settings but permit them to be overridden by
- * serial->type->init_termios.
+ * serial->type->init_termios on first open.
  *
  * This is the first place a new tty gets used.  Hence this is where we
  * acquire references to the usb_serial structure and the driver module,
@@ -178,6 +178,7 @@ static int serial_install(struct tty_driver *driver, struct tty_struct *tty)
 	int idx = tty->index;
 	struct usb_serial *serial;
 	struct usb_serial_port *port;
+	bool init_termios;
 	int retval = -ENODEV;
 
 	port = usb_serial_port_get_by_minor(idx);
@@ -192,14 +193,16 @@ static int serial_install(struct tty_driver *driver, struct tty_struct *tty)
 	if (retval)
 		goto error_get_interface;
 
+	init_termios = (driver->termios[idx] == NULL);
+
 	retval = tty_standard_install(driver, tty);
 	if (retval)
 		goto error_init_termios;
 
 	mutex_unlock(&serial->disc_mutex);
 
-	/* allow the driver to update the settings */
-	if (serial->type->init_termios)
+	/* allow the driver to update the initial settings */
+	if (init_termios && serial->type->init_termios)
 		serial->type->init_termios(tty);
 
 	tty->driver_data = port;
-- 
2.20.1


  parent reply	other threads:[~2019-05-22 19:25 UTC|newest]

Thread overview: 107+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-22 19:18 [PATCH AUTOSEL 5.0 001/317] gfs2: Fix lru_count going negative Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 002/317] cxgb4: Fix error path in cxgb4_init_module Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 003/317] afs: Fix getting the afs.fid xattr Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 004/317] NFS: make nfs_match_client killable Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 005/317] gfs2: fix race between gfs2_freeze_func and unmount Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 006/317] IB/hfi1: Fix WQ_MEM_RECLAIM warning Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 007/317] gfs2: Fix occasional glock use-after-free Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 008/317] mmc: core: Verify SD bus width Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 009/317] batman-adv: mcast: fix multicast tt/tvlv worker locking Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 010/317] tools/bpf: fix perf build error with uClibc (seen on ARC) Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 011/317] selftests/bpf: set RLIMIT_MEMLOCK properly for test_libbpf_open.c Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 012/317] bpftool: exclude bash-completion/bpftool from .gitignore pattern Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 013/317] ice: Separate if conditions for ice_set_features() Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 014/317] blk-mq: split blk_mq_alloc_and_init_hctx into two parts Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 015/317] blk-mq: grab .q_usage_counter when queuing request from plug code path Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 016/317] dmaengine: tegra210-dma: free dma controller in remove() Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 017/317] net: ena: gcc 8: fix compilation warning Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 018/317] net: ena: fix: set freed objects to NULL to avoid failing future allocations Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 019/317] hv_netvsc: fix race that may miss tx queue wakeup Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 020/317] orangefs: truncate before updating size Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 021/317] Bluetooth: Ignore CC events not matching the last HCI command Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 022/317] pinctrl: zte: fix leaked of_node references Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 023/317] ASoC: Intel: kbl_da7219_max98357a: Map BTN_0 to KEY_PLAYPAUSE Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 024/317] usb: dwc2: gadget: Increase descriptors count for ISOC's Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 025/317] usb: dwc3: move synchronize_irq() out of the spinlock protected block Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 026/317] usb: gadget: f_fs: don't free buffer prematurely Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 027/317] ASoC: hdmi-codec: unlock the device on startup errors Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 028/317] leds: avoid races with workqueue Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 029/317] powerpc/perf: Return accordingly on invalid chip-id in Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 030/317] powerpc/boot: Fix missing check of lseek() return value Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 031/317] powerpc/perf: Fix loop exit condition in nest_imc_event_init Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 032/317] spi: atmel-quadspi: fix crash while suspending Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 033/317] ASoC: imx: fix fiq dependencies Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 034/317] spi: pxa2xx: fix SCR (divisor) calculation Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 035/317] brcm80211: potential NULL dereference in brcmf_cfg80211_vndr_cmds_dcmd_handler() Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 036/317] ACPI / property: fix handling of data_nodes in acpi_get_next_subnode() Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 037/317] drm/nouveau/bar/nv50: ensure BAR is mapped Sasha Levin
2019-05-22 19:18 ` [PATCH AUTOSEL 5.0 038/317] media: stm32-dcmi: return appropriate error codes during probe Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 039/317] ARM: vdso: Remove dependency with the arch_timer driver internals Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 040/317] arm64: Fix compiler warning from pte_unmap() with -Wunused-but-set-variable Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 041/317] x86/ftrace: Set trampoline pages as executable Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 042/317] powerpc/watchdog: Use hrtimers for per-CPU heartbeat Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 043/317] sched/cpufreq: Fix kobject memleak Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 044/317] scsi: qla2xxx: Fix a qla24xx_enable_msix() error path Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 045/317] scsi: qla2xxx: Fix abort handling in tcm_qla2xxx_write_pending() Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 046/317] scsi: qla2xxx: Avoid that lockdep complains about unsafe locking in tcm_qla2xxx_close_session() Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 047/317] scsi: qla2xxx: Fix hardirq-unsafe locking Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 048/317] x86/modules: Avoid breaking W^X while loading modules Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 049/317] Btrfs: fix data bytes_may_use underflow with fallocate due to failed quota reserve Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 050/317] btrfs: fix panic during relocation after ENOSPC before writeback happens Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 051/317] btrfs: Don't panic when we can't find a root key Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 052/317] iwlwifi: pcie: don't crash on invalid RX interrupt Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 053/317] rtc: 88pm860x: prevent use-after-free on device remove Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 054/317] rtc: stm32: manage the get_irq probe defer case Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 055/317] scsi: qedi: Abort ep termination if offload not scheduled Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 056/317] s390/kexec_file: Fix detection of text segment in ELF loader Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 057/317] ALSA: hda: fix unregister device twice on ASoC driver Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 058/317] sched/nohz: Run NOHZ idle load balancer on HK_FLAG_MISC CPUs Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 059/317] net: ethernet: ti: cpsw: fix allmulti cfg in dual_mac mode Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 060/317] w1: fix the resume command API Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 061/317] net: hns3: fix for TX clean num when cleaning TX BD Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 062/317] net: phy: improve genphy_soft_reset Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 063/317] s390: qeth: address type mismatch warning Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 064/317] net: hns3: use atomic_t replace u32 for arq's count Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 065/317] dmaengine: pl330: _stop: clear interrupt status Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 066/317] mac80211/cfg80211: update bss channel on channel switch Sasha Levin
2019-05-22 19:19 ` Sasha Levin [this message]
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 068/317] libbpf: fix samples/bpf build failure due to undefined UINT32_MAX Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 069/317] slimbus: fix a potential NULL pointer dereference in of_qcom_slim_ngd_register Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 070/317] driver core: platform: Fix the usage of platform device name(pdev->name) Sasha Levin
2019-05-22 20:04   ` Greg Kroah-Hartman
2019-05-29 18:57     ` Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 071/317] driver core: Postpone DMA tear-down until after devres release for probe failure Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 072/317] ASoC: fsl_sai: Update is_slave_mode with correct value Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 073/317] Fix nfs4.2 return -EINVAL when do dedupe operation Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 074/317] mwifiex: prevent an array overflow Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 075/317] rsi: Fix NULL pointer dereference in kmalloc Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 076/317] net: cw1200: fix a NULL pointer dereference Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 077/317] at76c50x-usb: Don't register led_trigger if usb_register_driver failed Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 078/317] nvme: set 0 capacity if namespace block size exceeds PAGE_SIZE Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 079/317] nvme-rdma: fix a NULL deref when an admin connect times out Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 080/317] nvme-tcp: " Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 081/317] ssb: Fix possible NULL pointer dereference in ssb_host_pcmcia_exit Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 082/317] crypto: sun4i-ss - Fix invalid calculation of hash end Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 083/317] bcache: avoid potential memleak of list of journal_replay(s) in the CACHE_SYNC branch of run_cache_set Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 084/317] bcache: return error immediately in bch_journal_replay() Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 085/317] bcache: fix failure in journal relplay Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 086/317] bcache: add failure check to run_cache_set() for journal replay Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 087/317] bcache: avoid clang -Wunintialized warning Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 088/317] RDMA/cma: Consider scope_id while binding to ipv6 ll address Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 089/317] vfio-ccw: Do not call flush_workqueue while holding the spinlock Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 090/317] vfio-ccw: Release any channel program when releasing/removing vfio-ccw mdev Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 091/317] x86/build: Move _etext to actual end of .text Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 092/317] smpboot: Place the __percpu annotation correctly Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 093/317] x86/uaccess: Dont leak the AC flag into __put_user() argument evaluation Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 094/317] x86/mm: Remove in_nmi() warning from 64-bit implementation of vmalloc_fault() Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 095/317] mlxsw: spectrum_router: Prevent ipv6 gateway with v4 route via replace and append Sasha Levin
2019-05-22 19:27   ` David Ahern
2019-05-29 19:00     ` Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 096/317] mm/uaccess: Use 'unsigned long' to placate UBSAN warnings on older GCC versions Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 097/317] Bluetooth: hci_qca: Give enough time to ROME controller to bootup Sasha Levin
2019-05-22 19:19 ` [PATCH AUTOSEL 5.0 098/317] Bluetooth: btbcm: Add default address for BCM43341B Sasha Levin
2019-05-22 19:20 ` [PATCH AUTOSEL 5.0 099/317] HID: logitech-hidpp: use RAP instead of FAP to get the protocol version Sasha Levin
2019-05-22 19:20 ` [PATCH AUTOSEL 5.0 100/317] pinctrl: pistachio: fix leaked of_node references Sasha Levin
2019-05-22 19:20 ` [PATCH AUTOSEL 5.0 101/317] pinctrl: st: " Sasha Levin
2019-05-22 19:20 ` [PATCH AUTOSEL 5.0 102/317] pinctrl: samsung: " Sasha Levin
2019-05-22 19:20 ` [PATCH AUTOSEL 5.0 103/317] clk: rockchip: undo several noc and special clocks as critical on rk3288 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=20190522192338.23715-67-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=johan@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --subject='Re: [PATCH AUTOSEL 5.0 067/317] USB: serial: fix initial-termios handling' \
    /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: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).