[PATCH] platform/chrome: cros_ec_typec: Check ec platform device pointer

[PATCH] platform/chrome: cros_ec_typec: Check ec platform device pointer

[Tomasz Michalec]

It is possible that parent device for cros_ec_typec device is already
available, but ec pointer in parent driver data isn't populated yet. It
may happen when cros_typec_probe is running in parallel with
cros_ec_register. This leads to NULL pointer dereference when
cros_typec_probe tries to get driver data from typec->ec->ec->dev.

Check if typec->ec->ec is set before using it in cros_typec_probe.

Signed-off-by: Tomasz Michalec <tmichalec@google.com>
---
 drivers/platform/chrome/cros_ec_typec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index 7678e3d05fd3..1ef181614d4a 100644
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -1271,7 +1271,7 @@ static int cros_typec_probe(struct platform_device *pdev)
 	typec->dev = dev;
 
 	typec->ec = dev_get_drvdata(pdev->dev.parent);
-	if (!typec->ec) {
+	if (!typec->ec || !typec->ec->ec) {
 		dev_err(dev, "couldn't find parent EC device\n");
 		return -ENODEV;
 	}
-- 
2.50.0.727.gbf7dc18ff4-goog

Re: [PATCH] platform/chrome: cros_ec_typec: Check ec platform device pointer

[Tzung-Bi Shih]

On Tue, Jul 22, 2025 at 03:28:26PM +0200, Tomasz Michalec wrote:
> It is possible that parent device for cros_ec_typec device is already
> available, but ec pointer in parent driver data isn't populated yet. It
> may happen when cros_typec_probe is running in parallel with
> cros_ec_register. This leads to NULL pointer dereference when
> cros_typec_probe tries to get driver data from typec->ec->ec->dev.
> 
> Check if typec->ec->ec is set before using it in cros_typec_probe.
>
> [...]

Please use at least for-next branch as the commit base next time.  I have
fixed it this time.

Applied to

    https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git for-next

[1/1] platform/chrome: cros_ec_typec: Check ec platform device pointer
      commit: 731a4702b668ef28730e7d2414672b7085e757d6

Thanks!