Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9ca2010 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

serdev: ttyport: restore client ops on deregistration 



commit 0c5aae59270fb1f827acce182786094c9ccf598e upstream.

The serdev tty-port controller driver should reset the tty-port client
operations also on deregistration to avoid a NULL-pointer dereference in
case the port is later re-registered as a normal tty device.

Note that this can only happen with tty drivers such as 8250 which have
statically allocated port structures that can end up being reused and
where a later registration would not register a serdev controller (e.g.
due to registration errors or if the devicetree has been changed in
between).

Specifically, this can be an issue for any statically defined ports that
would be registered by 8250 core when an 8250 driver is being unbound.

Fixes: bed35c6d ("serdev: add a tty port controller driver")
Cc: stable <stable@vger.kernel.org>     # 4.11
Reported-by: default avatarLoic Poulain <loic.poulain@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20200210145730.22762-1-johan@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 463a3db8

drivers/tty/serdev/serdev-ttyport.c

+2 −4
Original line number Diff line number Diff line
@@ -265,7 +265,6 @@ struct device *serdev_tty_port_register(struct tty_port *port, 
					struct device *parent,

					struct tty_driver *drv, int idx)

{

	const struct tty_port_client_operations *old_ops;

	struct serdev_controller *ctrl;

	struct serport *serport;

	int ret;
@@ -284,7 +283,6 @@ struct device *serdev_tty_port_register(struct tty_port *port, 


	ctrl->ops = &ctrl_ops;



	old_ops = port->client_ops;

	port->client_ops = &client_ops;

	port->client_data = ctrl;
@@ -297,7 +295,7 @@ struct device *serdev_tty_port_register(struct tty_port *port, 


err_reset_data:

	port->client_data = NULL;

	port->client_ops = old_ops;

	port->client_ops = &tty_port_default_client_ops;

	serdev_controller_put(ctrl);



	return ERR_PTR(ret);
@@ -312,8 +310,8 @@ int serdev_tty_port_unregister(struct tty_port *port) 
		return -ENODEV;



	serdev_controller_remove(ctrl);

	port->client_ops = NULL;

	port->client_data = NULL;

	port->client_ops = &tty_port_default_client_ops;

	serdev_controller_put(ctrl);



	return 0;

drivers/tty/tty_port.c

+3 −2
Original line number Diff line number Diff line
@@ -52,10 +52,11 @@ static void tty_port_default_wakeup(struct tty_port *port) 
	}

}



static const struct tty_port_client_operations default_client_ops = {

const struct tty_port_client_operations tty_port_default_client_ops = {

	.receive_buf = tty_port_default_receive_buf,

	.write_wakeup = tty_port_default_wakeup,

};

EXPORT_SYMBOL_GPL(tty_port_default_client_ops);



void tty_port_init(struct tty_port *port)

{
@@ -68,7 +69,7 @@ void tty_port_init(struct tty_port *port) 
	spin_lock_init(&port->lock);

	port->close_delay = (50 * HZ) / 100;

	port->closing_wait = (3000 * HZ) / 100;

	port->client_ops = &default_client_ops;

	port->client_ops = &tty_port_default_client_ops;

	kref_init(&port->kref);

}

EXPORT_SYMBOL(tty_port_init);

include/linux/tty.h

+2 −0
Original line number Diff line number Diff line
@@ -225,6 +225,8 @@ struct tty_port_client_operations { 
	void (*write_wakeup)(struct tty_port *port);

};



extern const struct tty_port_client_operations tty_port_default_client_ops;



struct tty_port {

	struct tty_bufhead	buf;		/* Locked internally */

	struct tty_struct	*tty;		/* Back pointer */