Skip to contentSkip to conversation

sound/hda: Add NULL check to component match callback function

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

Subsystems (2)
lore
Share & tools
lore

Won Chung

author
#0 lore raw

PATCH v2 1/1 sound/hda: Add NULL check to component match callback function

Component match callback function needs to check if expected data is passed to it. 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 7b882fe3e3e8b ("ALSA: hda - handle multiple i915 device instances")

---
- Add "Fixes" tag
- Send to [email protected]

 sound/hda/hdac_i915.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/hda/hdac_i915.c +2 -2
index efe810af28c5..958b0975fa40 100644
@@ -102,13 +102,13 @@ static int i915_component_master_match(struct device *dev, int subcomponent,
 	struct pci_dev *hdac_pci, *i915_pci;
 	struct hdac_bus *bus = data;
 
-	if (!dev_is_pci(dev))
+	if (!dev_is_pci(dev) || !bus)
 		return 0;
 
 	hdac_pci = to_pci_dev(bus->dev);
 	i915_pci = to_pci_dev(dev);
 
-	if (!strcmp(dev->driver->name, "i915") &&
+	if (dev->driver && !strcmp(dev->driver->name, "i915") &&
 	    subcomponent == I915_COMPONENT_AUDIO &&
 	    connectivity_check(i915_pci, hdac_pci))
 		return 1;
Signature · 1 line
2.35.1.1021.g381101b075-goog
author
#1 lore raw
Quoted 38 lines · Won Chung

Component match callback function needs to check if expected data is passed to it. 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 7b882fe3e3e8b ("ALSA: hda - handle multiple i915 device instances")

---
- Add "Fixes" tag
- Send to [email protected]

 sound/hda/hdac_i915.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/hda/hdac_i915.c +2 -3
index efe810af28c5..958b0975fa40 100644
@@ -102,13 +102,13 @@ static int i915_component_master_match(struct device *dev, int subcomponent,
        struct pci_dev *hdac_pci, *i915_pci;
        struct hdac_bus *bus = data;
 
-       if (!dev_is_pci(dev))
+       if (!dev_is_pci(dev) || !bus)
                return 0;
 
        hdac_pci = to_pci_dev(bus->dev);
        i915_pci = to_pci_dev(dev);
 
-       if (!strcmp(dev->driver->name, "i915") &&
+       if (dev->driver && !strcmp(dev->driver->name, "i915") &&
            subcomponent == I915_COMPONENT_AUDIO &&
            connectivity_check(i915_pci, hdac_pci))
                return 1;
--
Quoted 2 lines

2.35.1.1021.g381101b075-goog

Hi,

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

Thanks,
Won