Skip to contentSkip to conversation

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

PATCH Superseded Won Chung 2 participants 3 messages Mar 30, 2022 1 message not in the archive

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Won Chung

author
#0 lore raw

PATCH 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.

---
 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

A message that is not in the archive (sent off-list or not yet received): CAFivqmLqDXWDyEiYMXvkjQTif9jjqau5nE9YtpYyy=F-PybvDg@mail.gmail.com

author
#2 lore raw
Quoted 49 lines · Prashant Malani

Hi Won,

Quoted 6 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.

IMO this should have a "Fixes" tag, and be picked back to stable branches. Also, please use my chromium.org account ([email protected]) for upstream communications.

Thanks!

Quoted 35 lines
---
 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;
 
Quoted 7 lines
Quoted 3 lines

--
2.35.1.1021.g381101b075-goog

--
-Prashant

Hi Prashant,

This currently does not fix a patch in the upstream, but is for a future patch of adding component_add to usb4_port. Would we need the "Fixes" tag for a future patch too?
Thinking again, I think it might be a better idea to have this as a series of patches along with the patch to be sent after this one.

I changed the recipient email to send this to your chromium.org account. Sorry for that.

Thanks,
Won

#3 lore raw

Hi Won,

Quoted 14 lines · Won Chung
Quoted 13 lines · Prashant Malani

Hi Won,

Quoted 6 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.

IMO this should have a "Fixes" tag, and be picked back to stable branches. Also, please use my chromium.org account ([email protected]) for upstream communications.

Quoted 7 lines
Quoted 1 line

Thanks!

Hi Prashant,

This currently does not fix a patch in the upstream, but is for a future patch of adding component_add to usb4_port. Would we need the "Fixes" tag for a future patch too?

I believe it is considered a fix to an original patch. Won, you should go back through git blame of this file to see which original commit originally added the component match callback in this and the other files.

Quoted 3 lines

Thinking again, I think it might be a better idea to have this as a series of patches along with the patch to be sent after this one.

I think these are focused enough that you don't need to send them in series.

Quoted 5 lines

I changed the recipient email to send this to your chromium.org account. Sorry for that.

Thanks,
Won

Thanks,
Benson

Signature · 7 lines
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
[email protected]
Chromium OS Project
[email protected]