Skip to content

Commit e21de14

Browse files
jwrdegoedegregkh
authored andcommitted
serial: Clear UPF_DEAD before calling tty_port_register_device_attr_serdev()
If a serdev_device_driver is already loaded for a serdev_tty_port when it gets registered by tty_port_register_device_attr_serdev() then that driver's probe() method will be called immediately. The serdev_device_driver's probe() method should then be able to call serdev_device_open() successfully, but because UPF_DEAD is still dead serdev_device_open() will fail with -ENXIO in this scenario: serdev_device_open() ctrl->ops->open() /* this callback being ttyport_open() */ tty->ops->open() /* this callback being uart_open() */ tty_port_open() port->ops->activate() /* this callback being uart_port_activate() */ Find bit UPF_DEAD is set in uport->flags and fail with errno -ENXIO. Fix this be clearing UPF_DEAD before tty_port_register_device_attr_serdev() note this only moves up the UPD_DEAD clearing a small bit, before: tty_port_register_device_attr_serdev(); mutex_unlock(&tty_port.mutex); uart_port.flags &= ~UPF_DEAD; mutex_unlock(&port_mutex); after: uart_port.flags &= ~UPF_DEAD; tty_port_register_device_attr_serdev(); mutex_unlock(&tty_port.mutex); mutex_unlock(&port_mutex); Reported-by: Weifeng Liu <weifeng.liu.z@gmail.com> Closes: https://lore.kernel.org/platform-driver-x86/20240505130800.2546640-1-weifeng.liu.z@gmail.com/ Tested-by: Weifeng Liu <weifeng.liu.z@gmail.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Link: https://lore.kernel.org/r/20240509141549.63704-1-hdegoede@redhat.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent a3d8728 commit e21de14

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/tty/serial/serial_core.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3207,6 +3207,9 @@ static int serial_core_add_one_port(struct uart_driver *drv, struct uart_port *u
32073207
if (uport->attr_group)
32083208
uport->tty_groups[1] = uport->attr_group;
32093209

3210+
/* Ensure serdev drivers can call serdev_device_open() right away */
3211+
uport->flags &= ~UPF_DEAD;
3212+
32103213
/*
32113214
* Register the port whether it's detected or not. This allows
32123215
* setserial to be used to alter this port's parameters.
@@ -3217,6 +3220,7 @@ static int serial_core_add_one_port(struct uart_driver *drv, struct uart_port *u
32173220
if (!IS_ERR(tty_dev)) {
32183221
device_set_wakeup_capable(tty_dev, 1);
32193222
} else {
3223+
uport->flags |= UPF_DEAD;
32203224
dev_err(uport->dev, "Cannot register tty device on line %d\n",
32213225
uport->line);
32223226
}
@@ -3426,8 +3430,6 @@ int serial_core_register_port(struct uart_driver *drv, struct uart_port *port)
34263430
if (ret)
34273431
goto err_unregister_port_dev;
34283432

3429-
port->flags &= ~UPF_DEAD;
3430-
34313433
mutex_unlock(&port_mutex);
34323434

34333435
return 0;

0 commit comments

Comments
 (0)