commit 8aeca7c04513e890c38ff6c44d1ae9cf480fb007 Author: Stefan Gottwald Date: Tue Jul 5 09:00:03 2022 +0200 LX7-6765 : Fix kernel NULL pointer derefernce on HP t550 (intel elkhart) device diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c index 826d494f3cc6..891b2c5624ac 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c @@ -1632,12 +1632,17 @@ const struct intel_pinctrl_soc_data *intel_pinctrl_get_soc_data(struct platform_ unsigned int i; adev = ACPI_COMPANION(&pdev->dev); - if (adev) { + if (adev && !adev->pnp.unique_id) { + printk(KERN_ERR "intel_pinctrl_get_soc_data: adev->pnp.unique_id is NULL\n"); + } + if (adev && adev->pnp.unique_id) { const void *match = device_get_match_data(&pdev->dev); table = (const struct intel_pinctrl_soc_data **)match; for (i = 0; table[i]; i++) { - if (!strcmp(adev->pnp.unique_id, table[i]->uid)) { + if (!table[i]->uid) { + printk(KERN_ERR "intel_pinctrl_get_soc_data: table[%d]->uid is NULL\n", i); + } else if (!strcmp(adev->pnp.unique_id, table[i]->uid)) { data = table[i]; break; }