Skip to contentSkip to conversation

platform/x86: lenovo-yoga-tab2-pro-1380-fastcharger: fix race condition

PATCH Superseded yangchenyuan 2 participants 2 messages Jan 11, 2025 x86 platform drivers

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 platform/x86: lenovo-yoga-tab2-pro-1380-fastcharger: fix race condition

From: Chenyuan Yang <[email protected]>

The yt2_1380_fc_serdev_probe() function calls devm_serdev_device_open() before it calls serdev_device_set_client_ops(). This can trigger a NULL pointer dereference.
This is similar to 5e700b384ec13f5bcac9855cb28fcc674f1d3593.

Fixes b2ed33e8d486 ("platform/x86: Add lenovo-yoga-tab2-pro-1380-fastcharger driver")
---
 .../platform/x86/lenovo-yoga-tab2-pro-1380-fastcharger.c  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/platform/x86/lenovo-yoga-tab2-pro-1380-fastcharger.c +4 -4
index d2699ca24f34..1a4e66464a7e 100644
@@ -199,15 +199,15 @@ static int yt2_1380_fc_serdev_probe(struct serdev_device *serdev)
 	if (ret)
 		return ret;
 
-	ret = devm_serdev_device_open(dev, serdev);
-	if (ret)
-		return dev_err_probe(dev, ret, "opening UART device\n");
-
 	serdev_device_set_baudrate(serdev, 600);
 	serdev_device_set_flow_control(serdev, false);
 	serdev_device_set_drvdata(serdev, fc);
 	serdev_device_set_client_ops(serdev, &yt2_1380_fc_serdev_ops);
 
+	ret = devm_serdev_device_open(dev, serdev);
+	if (ret)
+		return dev_err_probe(dev, ret, "opening UART device\n");
+
 	ret = devm_extcon_register_notifier_all(dev, fc->extcon, &fc->nb);
 	if (ret)
 		return dev_err_probe(dev, ret, "registering extcon notifier\n");
Signature · 1 line
2.34.1
#1 lore raw

Hi,

Quoted 9 lines · yangchenyuan

From: Chenyuan Yang <[email protected]>

The yt2_1380_fc_serdev_probe() function calls devm_serdev_device_open() before it calls serdev_device_set_client_ops(). This can trigger a NULL pointer dereference.
This is similar to 5e700b384ec13f5bcac9855cb28fcc674f1d3593.

Fixes b2ed33e8d486 ("platform/x86: Add lenovo-yoga-tab2-pro-1380-fastcharger driver")

Thank you for your patch.

Quoted 15 lines
---
 .../platform/x86/lenovo-yoga-tab2-pro-1380-fastcharger.c  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/platform/x86/lenovo-yoga-tab2-pro-1380-fastcharger.c +0 -3
index d2699ca24f34..1a4e66464a7e 100644
@@ -199,15 +199,15 @@ static int yt2_1380_fc_serdev_probe(struct serdev_device *serdev)
 	if (ret)
 		return ret;
 
-	ret = devm_serdev_device_open(dev, serdev);
-	if (ret)
-		return dev_err_probe(dev, ret, "opening UART device\n");

drivers/platform/x86/lenovo-yoga-tab2-pro-1380-fastcharger.c static int yt2_1380_fc_serdev_probe(struct serdev_device *serdev) · line 210

Quoted 10 lines
drivers/platform/x86/lenovo-yoga-tab2-pro-1380-fastcharger.c +4 -1
-
 	serdev_device_set_baudrate(serdev, 600);
 	serdev_device_set_flow_control(serdev, false);
 	serdev_device_set_drvdata(serdev, fc);
 	serdev_device_set_client_ops(serdev, &yt2_1380_fc_serdev_ops);
 
+	ret = devm_serdev_device_open(dev, serdev);
+	if (ret)
+		return dev_err_probe(dev, ret, "opening UART device\n");
+

serdev_device_open() resets the termios settings such as flow-control, so you need to move the serdev_device_set_baudrate() and serdev_device_set_flow_control() calls to after the new location of the devm_serdev_device_open() call, just like commit 5e700b384ec1 ("platform/chrome: cros_ec_uart: properly fix race condition") does.

Regards,

Hans

Quoted 3 lines
drivers/platform/x86/lenovo-yoga-tab2-pro-1380-fastcharger.c +0 -0
 	ret = devm_extcon_register_notifier_all(dev, fc->extcon, &fc->nb);
 	if (ret)
 		return dev_err_probe(dev, ret, "registering extcon notifier\n");