Skip to content

Commit

Permalink
w1: fix NULL pointer dereference in probe
Browse files Browse the repository at this point in the history
[ Upstream commit 0dd6770 ]

The w1_uart_probe() function calls w1_uart_serdev_open() (which includes
devm_serdev_device_open()) before setting the client ops via
serdev_device_set_client_ops(). This ordering can trigger a NULL pointer
dereference in the serdev controller's receive_buf handler, as it assumes
serdev->ops is valid when SERPORT_ACTIVE is set.

This is similar to the issue fixed in commit 5e700b3
("platform/chrome: cros_ec_uart: properly fix race condition") where
devm_serdev_device_open() was called before fully initializing the
device.

Fix the race by ensuring client ops are set before enabling the port via
w1_uart_serdev_open().

Fixes: a3c0880 ("w1: add UART w1 bus driver")
Signed-off-by: Chenyuan Yang <chenyuan0y@gmail.com>
Acked-by: Christoph Winklhofer <cj.winklhofer@gmail.com>
Link: https://lore.kernel.org/r/20250111181803.2283611-1-chenyuan0y@gmail.com
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Chenyuan Yang authored and Greg Kroah-Hartman committed Apr 10, 2025
1 parent 0803468 commit cc6b0ec
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/w1/masters/w1-uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -372,11 +372,11 @@ static int w1_uart_probe(struct serdev_device *serdev)
init_completion(&w1dev->rx_byte_received);
mutex_init(&w1dev->rx_mutex);

serdev_device_set_drvdata(serdev, w1dev);
serdev_device_set_client_ops(serdev, &w1_uart_serdev_ops);
ret = w1_uart_serdev_open(w1dev);
if (ret < 0)
return ret;
serdev_device_set_drvdata(serdev, w1dev);
serdev_device_set_client_ops(serdev, &w1_uart_serdev_ops);

return w1_add_master_device(&w1dev->bus);
}
Expand Down

0 comments on commit cc6b0ec

Please sign in to comment.