Skip to contentSkip to conversation

USB: OHCI: Check the overrides pointer for NULL in ohci_init_driver()

PATCH In review Tomasz Figa 2 participants 3 messages Sep 28, 2013 – Sep 29, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 USB: OHCI: Check the overrides pointer for NULL in ohci_init_driver()

A series of commit starting at

50a97e059b USB: OHCI: make ohci-exynos a separate driver

and ending at

b8ad5c3706 USB: OHCI: make ohci-pxa27x a separate driver

introduced the concept of separate OHCI drivers for particular controllers. Respective drivers need to call ohci_init_driver() to initialize hc_driver struct with generic data and to certain extent with platform specific overrides through ohci_driver_overrides struct passed as second argument to this function. However the code does not check if the ohci_driver_overrides struct pointer is non-NULL, which leads for a NULL pointer dereference for drivers that do not need any overrides.

This patch fixes the problem by dereferencing the passed pointer to ohci_driver_overrides struct only if it is non-NULL.

---
 drivers/usb/host/ohci-hcd.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/usb/host/ohci-hcd.c +6 -4
index 21d937a..8ada13f 100644
@@ -1161,10 +1161,12 @@ void ohci_init_driver(struct hc_driver *drv,
 	/* Copy the generic table to drv and then apply the overrides */
 	*drv = ohci_hc_driver;
 
-	drv->product_desc = over->product_desc;
-	drv->hcd_priv_size += over->extra_priv_size;
-	if (over->reset)
-		drv->reset = over->reset;
+	if (over) {
+		drv->product_desc = over->product_desc;
+		drv->hcd_priv_size += over->extra_priv_size;
+		if (over->reset)
+			drv->reset = over->reset;
+	}
 }
 EXPORT_SYMBOL_GPL(ohci_init_driver);
 
Signature · 1 line
1.8.3.2
maintainer
#1 lore raw
Quoted 35 lines · Tomasz Figa

A series of commit starting at

50a97e059b USB: OHCI: make ohci-exynos a separate driver

and ending at

b8ad5c3706 USB: OHCI: make ohci-pxa27x a separate driver

introduced the concept of separate OHCI drivers for particular controllers. Respective drivers need to call ohci_init_driver() to initialize hc_driver struct with generic data and to certain extent with platform specific overrides through ohci_driver_overrides struct passed as second argument to this function. However the code does not check if the ohci_driver_overrides struct pointer is non-NULL, which leads for a NULL pointer dereference for drivers that do not need any overrides.

This patch fixes the problem by dereferencing the passed pointer to ohci_driver_overrides struct only if it is non-NULL.

---
 drivers/usb/host/ohci-hcd.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/usb/host/ohci-hcd.c +0 -2
index 21d937a..8ada13f 100644
@@ -1161,10 +1161,12 @@ void ohci_init_driver(struct hc_driver *drv,
 	/* Copy the generic table to drv and then apply the overrides */
 	*drv = ohci_hc_driver;
 
-	drv->product_desc = over->product_desc;
-	drv->hcd_priv_size += over->extra_priv_size;

drivers/usb/host/ohci-hcd.c void ohci_init_driver(struct hc_driver *drv, · line 1171

Quoted 10 lines
drivers/usb/host/ohci-hcd.c +6 -2
-	if (over->reset)
-		drv->reset = over->reset;
+	if (over) {
+		drv->product_desc = over->product_desc;
+		drv->hcd_priv_size += over->extra_priv_size;
+		if (over->reset)
+			drv->reset = over->reset;
+	}
 }
 EXPORT_SYMBOL_GPL(ohci_init_driver);

You were scooped by Kevin Hilman:

	http://marc.info/?l=linux-usb&m=138029463906143&w=2

Alan Stern

#2 lore raw
Quoted 47 lines · On Saturday 28 of September 2013 23:00:27 Alan Stern wrote:
Quoted 46 lines · Tomasz Figa

A series of commit starting at

50a97e059b USB: OHCI: make ohci-exynos a separate driver

and ending at

b8ad5c3706 USB: OHCI: make ohci-pxa27x a separate driver

introduced the concept of separate OHCI drivers for particular controllers. Respective drivers need to call ohci_init_driver() to initialize hc_driver struct with generic data and to certain extent with platform specific overrides through ohci_driver_overrides struct passed as second argument to this function. However the code does not check if the ohci_driver_overrides struct pointer is non-NULL, which leads for a NULL pointer dereference for drivers that do not need any overrides.

This patch fixes the problem by dereferencing the passed pointer to ohci_driver_overrides struct only if it is non-NULL.

---

 drivers/usb/host/ohci-hcd.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/usb/host/ohci-hcd.c +6 -4
index 21d937a..8ada13f 100644
@@ -1161,10 +1161,12 @@ void ohci_init_driver(struct hc_driver *drv,
 
 	/* Copy the generic table to drv and then apply the overrides */
 	*drv = ohci_hc_driver;
 
-	drv->product_desc = over->product_desc;
-	drv->hcd_priv_size += over->extra_priv_size;
-	if (over->reset)
-		drv->reset = over->reset;
+	if (over) {
+		drv->product_desc = over->product_desc;
+		drv->hcd_priv_size += over->extra_priv_size;
+		if (over->reset)
+			drv->reset = over->reset;
+	}
 
Quoted 6 lines
Quoted 2 lines
drivers/usb/host/ohci-hcd.c +0 -0
 }

EXPORT_SYMBOL_GPL(ohci_init_driver);

You were scooped by Kevin Hilman:

	http://marc.info/?l=linux-usb&m=138029463906143&w=2

Happens. :)

Nice to have this fixed anyway.

Best regards,
Tomasz