[PATCH 12/13] USB: Core: fix race in device_create

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <linux-kernel@...>
Cc: Greg Kroah-Hartman <gregkh@...>, Kay Sievers <kay.sievers@...>
Date: Tuesday, May 20, 2008 - 6:34 pm

There is a race from when a device is created with device_create() and
then the drvdata is set with a call to dev_set_drvdata() in which a
sysfs file could be open, yet the drvdata will be NULL, causing all
sorts of bad things to happen.

This patch fixes the problem by using the new function,
device_create_drvdata().

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/usb/core/hcd.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index bf10e9c..09a53e7 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -818,12 +818,12 @@ static int usb_register_bus(struct usb_bus *bus)
 	set_bit (busnum, busmap.busmap);
 	bus->busnum = busnum;
 
-	bus->dev = device_create(usb_host_class, bus->controller, MKDEV(0, 0),
-				 "usb_host%d", busnum);
+	bus->dev = device_create_drvdata(usb_host_class, bus->controller,
+					 MKDEV(0, 0), bus,
+					 "usb_host%d", busnum);
 	result = PTR_ERR(bus->dev);
 	if (IS_ERR(bus->dev))
 		goto error_create_class_dev;
-	dev_set_drvdata(bus->dev, bus);
 
 	/* Add it to the local list of buses */
 	list_add (&bus->bus_list, &usb_bus_list);
-- 
1.5.5.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[GIT PATCH] driver core fixes against 2.6.26-rc3, Greg KH, (Tue May 20, 6:32 pm)
[PATCH 13/13] SCSI: fix race in device_create, Greg Kroah-Hartman, (Tue May 20, 6:35 pm)
[PATCH 12/13] USB: Core: fix race in device_create, Greg Kroah-Hartman, (Tue May 20, 6:34 pm)
[PATCH 11/13] USB: Phidget: fix race in device_create, Greg Kroah-Hartman, (Tue May 20, 6:34 pm)
[PATCH 10/13] s390: fix race in device_create, Greg Kroah-Hartman, (Tue May 20, 6:34 pm)
[PATCH 09/13] SOUND: fix race in device_create, Greg Kroah-Hartman, (Tue May 20, 6:34 pm)
[PATCH 08/13] UIO: fix race in device_create, Greg Kroah-Hartman, (Tue May 20, 6:34 pm)
[PATCH 07/13] Power Supply: fix race in device_create, Greg Kroah-Hartman, (Tue May 20, 6:34 pm)
[PATCH 06/13] LEDS: fix race in device_create, Greg Kroah-Hartman, (Tue May 20, 6:34 pm)
[PATCH 05/13] IB: fix race in device_create, Greg Kroah-Hartman, (Tue May 20, 6:34 pm)
[PATCH 03/13] fbdev: fix race in device_create, Greg Kroah-Hartman, (Tue May 20, 6:34 pm)
[PATCH 04/13] ide: fix race in device_create, Greg Kroah-Hartman, (Tue May 20, 6:34 pm)
[PATCH 02/13] mm: bdi: fix race in bdi_class device creation, Greg Kroah-Hartman, (Tue May 20, 6:34 pm)
[PATCH 01/13] Driver core: add device_create_vargs and devic..., Greg Kroah-Hartman, (Tue May 20, 6:34 pm)