Skip to contentSkip to conversation

misc/mei: Add NULL check to component match callback functions

PATCH Superseded Won Chung 1 participant 2 messages Mar 30, 2022

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Won Chung

author
#0 lore raw

PATCH v2 1/1 misc/mei: Add NULL check to component match callback functions

Component match callback functions need to check if expected data is passed to them. Without this check, it can cause a NULL pointer dereference when another driver registers a component before i915 drivers have their component master fully bind.

Fixes 1e8d19d9b0dfc ("mei: hdcp: bind only with i915 on the same PCH")
Fixes c2004ce99ed73 ("mei: pxp: export pavp client to me client bus")

---
Changes from v1:
- Add "Fixes" tag
- Send to [email protected]

 drivers/misc/mei/hdcp/mei_hdcp.c | 2 +-
 drivers/misc/mei/pxp/mei_pxp.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/misc/mei/hdcp/mei_hdcp.c +1 -1
index ec2a4fce8581..843dbc2b21b1 100644
@@ -784,7 +784,7 @@ static int mei_hdcp_component_match(struct device *dev, int subcomponent,
 {
 	struct device *base = data;
 
-	if (strcmp(dev->driver->name, "i915") ||
+	if (!base || !dev->driver || strcmp(dev->driver->name, "i915") ||
 	    subcomponent != I915_COMPONENT_HDCP)
 		return 0;
 
drivers/misc/mei/pxp/mei_pxp.c +1 -1
index f7380d387bab..e32a81da8af6 100644
@@ -131,7 +131,7 @@ static int mei_pxp_component_match(struct device *dev, int subcomponent,
 {
 	struct device *base = data;
 
-	if (strcmp(dev->driver->name, "i915") ||
+	if (!base || !dev->driver || strcmp(dev->driver->name, "i915") ||
 	    subcomponent != I915_COMPONENT_PXP)
 		return 0;
 
Signature · 1 line
2.35.1.1021.g381101b075-goog
author
#1 lore raw
Quoted 47 lines · Won Chung

Component match callback functions need to check if expected data is passed to them. Without this check, it can cause a NULL pointer dereference when another driver registers a component before i915 drivers have their component master fully bind.

Fixes 1e8d19d9b0dfc ("mei: hdcp: bind only with i915 on the same PCH")
Fixes c2004ce99ed73 ("mei: pxp: export pavp client to me client bus")

---
Changes from v1:
- Add "Fixes" tag
- Send to [email protected]

 drivers/misc/mei/hdcp/mei_hdcp.c | 2 +-
 drivers/misc/mei/pxp/mei_pxp.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/misc/mei/hdcp/mei_hdcp.c +1 -1
index ec2a4fce8581..843dbc2b21b1 100644
@@ -784,7 +784,7 @@ static int mei_hdcp_component_match(struct device *dev, int subcomponent,
 {
        struct device *base = data;
 
-       if (strcmp(dev->driver->name, "i915") ||
+       if (!base || !dev->driver || strcmp(dev->driver->name, "i915") ||
            subcomponent != I915_COMPONENT_HDCP)
                return 0;
 
drivers/misc/mei/pxp/mei_pxp.c +1 -2
index f7380d387bab..e32a81da8af6 100644
@@ -131,7 +131,7 @@ static int mei_pxp_component_match(struct device *dev, int subcomponent,
 {
        struct device *base = data;
 
-       if (strcmp(dev->driver->name, "i915") ||
+       if (!base || !dev->driver || strcmp(dev->driver->name, "i915") ||
            subcomponent != I915_COMPONENT_PXP)
                return 0;
 
--
Quoted 2 lines

2.35.1.1021.g381101b075-goog

Hi,

I am resending this patch to correct email account. Sorry for confusion.

Thanks,
Won