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

tty: make tty_ldisc_ops a param in tty_unregister_ldisc

Browse Source 
Make tty_unregister_ldisc symmetric to tty_register_ldisc by accepting
struct tty_ldisc_ops as a parameter instead of ldisc number. This avoids
checking of the ldisc number bounds in tty_unregister_ldisc.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: William Hubbs <w.d.hubbs@gmail.com>
Cc: Chris Brannon <chris@the-brannons.com>
Cc: Kirk Reiser <kirk@reisers.ca>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Johan Hedberg <johan.hedberg@gmail.com>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Andreas Koensgen <ajk@comnets.uni-bremen.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Rodolfo Giometti <giometti@enneenne.com>
Cc: Peter Ujfalusi <peter.ujfalusi@gmail.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Link: https://lore.kernel.org/r/20210505091928.22010-17-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2021-05-05 11:19:09 +02:00 committed by Greg Kroah-Hartman
parent 839e0f226d
commit f81ee8b8b8
19 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/accessibility/speakup/spk_ttyio.c
View File

@ -219,7 +219,7 @@ void spk_ttyio_register_ldisc(void)
void spk_ttyio_unregister_ldisc(void)
{
if (tty_unregister_ldisc(N_SPEAKUP))
if (tty_unregister_ldisc(&spk_ttyio_ldisc_ops))
pr_warn("speakup: Couldn't unregister ldisc\n");
}

2
drivers/bluetooth/hci_ldisc.c
View File

@ -917,7 +917,7 @@ static void __exit hci_uart_exit(void)
#endif
/* Release tty registration of line discipline */
err = tty_unregister_ldisc(N_HCI);
err = tty_unregister_ldisc(&hci_uart_ldisc);
if (err)
BT_ERR("Can't unregister HCI line discipline (%d)", err);
}

2
drivers/input/serio/serport.c
View File

@ -304,7 +304,7 @@ static int __init serport_init(void)
static void __exit serport_exit(void)
{
tty_unregister_ldisc(N_MOUSE);
tty_unregister_ldisc(&serport_ldisc);
}
module_init(serport_init);

6
drivers/misc/ti-st/st_core.c
View File

@ -872,7 +872,7 @@ int st_core_init(struct st_data_s **core_data)
st_gdata = kzalloc(sizeof(struct st_data_s), GFP_KERNEL);
if (!st_gdata) {
pr_err("memory allocation failed");
err = tty_unregister_ldisc(N_TI_WL);
err = tty_unregister_ldisc(&st_ldisc_ops);
if (err)
pr_err("unable to un-register ldisc %ld", err);
err = -ENOMEM;
@ -892,7 +892,7 @@ int st_core_init(struct st_data_s **core_data)
if (err) {
pr_err("error during st_ll initialization(%ld)", err);
kfree(st_gdata);
err = tty_unregister_ldisc(N_TI_WL);
err = tty_unregister_ldisc(&st_ldisc_ops);
if (err)
pr_err("unable to un-register ldisc");
return err;
@ -919,7 +919,7 @@ void st_core_exit(struct st_data_s *st_gdata)
kfree_skb(st_gdata->rx_skb);
kfree_skb(st_gdata->tx_skb);
/* TTY ldisc cleanup */
err = tty_unregister_ldisc(N_TI_WL);
err = tty_unregister_ldisc(&st_ldisc_ops);
if (err)
pr_err("unable to un-register ldisc %ld", err);
/* free the global data pointer */

2
drivers/net/caif/caif_serial.c
View File

@ -447,7 +447,7 @@ static void __exit caif_ser_exit(void)
spin_unlock(&ser_lock);
ser_release(NULL);
cancel_work_sync(&ser_release_work);
tty_unregister_ldisc(N_CAIF);
tty_unregister_ldisc(&caif_ldisc);
debugfs_remove_recursive(debugfsdir);
}

2
drivers/net/can/slcan.c
View File

@ -784,7 +784,7 @@ static void __exit slcan_exit(void)
kfree(slcan_devs);
slcan_devs = NULL;
i = tty_unregister_ldisc(N_SLCAN);
i = tty_unregister_ldisc(&slc_ldisc);
if (i)
printk(KERN_ERR "slcan: can't unregister ldisc (err %d)\n", i);
}

2
drivers/net/hamradio/6pack.c
View File

@ -781,7 +781,7 @@ static void __exit sixpack_exit_driver(void)
{
int ret;
if ((ret = tty_unregister_ldisc(N_6PACK)))
if ((ret = tty_unregister_ldisc(&sp_ldisc)))
printk(msg_unregfail, ret);
}

2
drivers/net/hamradio/mkiss.c
View File

@ -967,7 +967,7 @@ static void __exit mkiss_exit_driver(void)
{
int ret;
if ((ret = tty_unregister_ldisc(N_AX25)))
if ((ret = tty_unregister_ldisc(&ax_ldisc)))
printk(msg_unregfail, ret);
}

2
drivers/net/ppp/ppp_async.c
View File

@ -1016,7 +1016,7 @@ static void async_lcp_peek(struct asyncppp *ap, unsigned char *data,
static void __exit ppp_async_cleanup(void)
{
if (tty_unregister_ldisc(N_PPP) != 0)
if (tty_unregister_ldisc(&ppp_ldisc) != 0)
printk(KERN_ERR "failed to unregister PPP line discipline\n");
}

2
drivers/net/ppp/ppp_synctty.c
View File

@ -727,7 +727,7 @@ err:
static void __exit
ppp_sync_cleanup(void)
{
if (tty_unregister_ldisc(N_SYNC_PPP) != 0)
if (tty_unregister_ldisc(&ppp_sync_ldisc) != 0)
printk(KERN_ERR "failed to unregister Sync PPP line discipline\n");
}

2
drivers/net/slip/slip.c
View File

@ -1360,7 +1360,7 @@ static void __exit slip_exit(void)
kfree(slip_devs);
slip_devs = NULL;
i = tty_unregister_ldisc(N_SLIP);
i = tty_unregister_ldisc(&sl_ldisc);
if (i != 0)
printk(KERN_ERR "SLIP: can't unregister line discipline (err = %d)\n", i);
}

2
drivers/pps/clients/pps-ldisc.c
View File

@ -131,7 +131,7 @@ static void __exit pps_tty_cleanup(void)
{
int err;
err = tty_unregister_ldisc(N_PPS);
err = tty_unregister_ldisc(&pps_ldisc_ops);
if (err)
pr_err("can't unregister PPS line discipline\n");
else

4
drivers/tty/n_gsm.c
View File

@ -3280,13 +3280,13 @@ static int __init gsm_init(void)
err_put_driver:
put_tty_driver(gsm_tty_driver);
err_unreg_ldisc:
tty_unregister_ldisc(N_GSM0710);
tty_unregister_ldisc(&tty_ldisc_packet);
return status;
}
static void __exit gsm_exit(void)
{
int status = tty_unregister_ldisc(N_GSM0710);
int status = tty_unregister_ldisc(&tty_ldisc_packet);
if (status != 0)
pr_err("n_gsm: can't unregister line discipline (err = %d)\n",
status);

3
drivers/tty/n_hdlc.c
View File

@ -822,8 +822,7 @@ static int __init n_hdlc_init(void)
static void __exit n_hdlc_exit(void)
{
/* Release tty registration of line discipline */
int status = tty_unregister_ldisc(N_HDLC);
int status = tty_unregister_ldisc(&n_hdlc_ldisc);
if (status)
pr_err("N_HDLC: can't unregister line discipline (err = %d)\n",

2
drivers/tty/n_null.c
View File

@ -57,7 +57,7 @@ static int __init n_null_init(void)
static void __exit n_null_exit(void)
{
tty_unregister_ldisc(N_NULL);
tty_unregister_ldisc(&null_ldisc);
}
module_init(n_null_init);

9
drivers/tty/tty_ldisc.c
View File

@ -87,19 +87,16 @@ EXPORT_SYMBOL(tty_register_ldisc);
* takes tty_ldiscs_lock to guard against ldisc races
*/
int tty_unregister_ldisc(int disc)
int tty_unregister_ldisc(struct tty_ldisc_ops *ldisc)
{
unsigned long flags;
int ret = 0;
if (disc < N_TTY || disc >= NR_LDISCS)
return -EINVAL;
raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
if (tty_ldiscs[disc]->refcount)
if (tty_ldiscs[ldisc->num]->refcount)
ret = -EBUSY;
else
tty_ldiscs[disc] = NULL;
tty_ldiscs[ldisc->num] = NULL;
raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
return ret;

2
include/linux/tty.h
View File

@ -637,7 +637,7 @@ static inline int tty_port_users(struct tty_port *port)
}
extern int tty_register_ldisc(struct tty_ldisc_ops *new_ldisc);
extern int tty_unregister_ldisc(int disc);
extern int tty_unregister_ldisc(struct tty_ldisc_ops *ldisc);
extern int tty_set_ldisc(struct tty_struct *tty, int disc);
extern int tty_ldisc_receive_buf(struct tty_ldisc *ld, const unsigned char *p,
const char *f, int count);

2
net/nfc/nci/uart.c
View File

@ -462,7 +462,7 @@ static int __init nci_uart_init(void)
static void __exit nci_uart_exit(void)
{
tty_unregister_ldisc(N_NCI);
tty_unregister_ldisc(&nci_uart_ldisc);
}
module_init(nci_uart_init);

2
sound/soc/ti/ams-delta.c
View File

@ -583,7 +583,7 @@ static int ams_delta_remove(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
if (tty_unregister_ldisc(N_V253) != 0)
if (tty_unregister_ldisc(&cx81801_ops) != 0)
dev_warn(&pdev->dev,
"failed to unregister V253 line discipline\n");