| Message ID | 20250313162211.3650958-1-chenyuan0y@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | usb: typec: ucsi: acpi: Add Null check for adev | expand |
On 13/03/2025 17:22, Chenyuan Yang wrote: > Not all devices have an ACPI companion fwnode, so adev might be NULL. > This is similar to the commit cd2fd6eab480 > ("platform/x86: int3472: Check for adev == NULL"). Read that commit carefully and provide steps how can we reproduce it - bind this driver to different platform device or i2c device via sysfs? Best regards, Krzysztof
diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/ucsi_acpi.c index ac1ebb5d9527..d517914c6439 100644 --- a/drivers/usb/typec/ucsi/ucsi_acpi.c +++ b/drivers/usb/typec/ucsi/ucsi_acpi.c @@ -189,6 +189,9 @@ static int ucsi_acpi_probe(struct platform_device *pdev) acpi_status status; int ret; + if (!adev) + return -ENODEV; + if (adev->dep_unmet) return -EPROBE_DEFER;
Not all devices have an ACPI companion fwnode, so adev might be NULL. This is similar to the commit cd2fd6eab480 ("platform/x86: int3472: Check for adev == NULL"). Add a check for adev not being set and return -ENODEV in that case to avoid a possible NULL pointer deref in ucsi_acpi_probe(). Signed-off-by: Chenyuan Yang <chenyuan0y@gmail.com> --- drivers/usb/typec/ucsi/ucsi_acpi.c | 3 +++ 1 file changed, 3 insertions(+)