Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Currently, component_match callback functions used in mei refers to the
driver name, assuming that the component device being matched has a
driver bound. It can cause a NULL pointer dereference when a device
without a driver bound registers a component. This is due to the nature
of the component framework where all registered components are matched
in any component_match callback functions. So even if a component is
registered by a totally irrelevant device, that component is also
shared to these callbacks for i915 driver.

To prevent totally irrelevant device being matched for i915 and causing
a NULL pointer dereference for checking driver name, add a NULL check on
dev->driver to check if there is a driver bound before checking the
driver name.

In the future, the string compare on the driver name, "i915" may need to
be refactored too.

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Prashant Malani <pmalani@chromium.org>
Signed-off-by: Won Chung <wonchung@google.com>
Acked-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
This commit is contained in:
Won Chung 2022-04-18 17:59:31 +00:00 committed by Mika Westerberg
parent 9d2d0a5cf0
commit 84d4333c1e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/misc/mei/hdcp/mei_hdcp.c
View File

@ -784,7 +784,7 @@ static int mei_hdcp_component_match(struct device *dev, int subcomponent,
{ {
struct device *base = data; struct device *base = data;
if (strcmp(dev->driver->name, "i915") || if (!dev->driver || strcmp(dev->driver->name, "i915") ||
subcomponent != I915_COMPONENT_HDCP) subcomponent != I915_COMPONENT_HDCP)
return 0; return 0;

2
drivers/misc/mei/pxp/mei_pxp.c
View File

@ -131,7 +131,7 @@ static int mei_pxp_component_match(struct device *dev, int subcomponent,
{ {
struct device *base = data; struct device *base = data;
if (strcmp(dev->driver->name, "i915") || if (!dev->driver || strcmp(dev->driver->name, "i915") ||
subcomponent != I915_COMPONENT_PXP) subcomponent != I915_COMPONENT_PXP)
return 0; return 0;