Commit 6c06aec2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

IB: fix race in device_create

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>
Reviewed-by: default avatarRoland Dreier <rolandd@cisco.com>
Cc: Sean Hefty <sean.hefty@intel.com>
Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 716ad875
...@@ -1005,8 +1005,9 @@ static int ib_umad_init_port(struct ib_device *device, int port_num, ...@@ -1005,8 +1005,9 @@ static int ib_umad_init_port(struct ib_device *device, int port_num,
if (cdev_add(port->cdev, base_dev + port->dev_num, 1)) if (cdev_add(port->cdev, base_dev + port->dev_num, 1))
goto err_cdev; goto err_cdev;
port->dev = device_create(umad_class, device->dma_device, port->dev = device_create_drvdata(umad_class, device->dma_device,
port->cdev->dev, "umad%d", port->dev_num); port->cdev->dev, port,
"umad%d", port->dev_num);
if (IS_ERR(port->dev)) if (IS_ERR(port->dev))
goto err_cdev; goto err_cdev;
...@@ -1024,15 +1025,12 @@ static int ib_umad_init_port(struct ib_device *device, int port_num, ...@@ -1024,15 +1025,12 @@ static int ib_umad_init_port(struct ib_device *device, int port_num,
if (cdev_add(port->sm_cdev, base_dev + port->dev_num + IB_UMAD_MAX_PORTS, 1)) if (cdev_add(port->sm_cdev, base_dev + port->dev_num + IB_UMAD_MAX_PORTS, 1))
goto err_sm_cdev; goto err_sm_cdev;
port->sm_dev = device_create(umad_class, device->dma_device, port->sm_dev = device_create_drvdata(umad_class, device->dma_device,
port->sm_cdev->dev, port->sm_cdev->dev, port,
"issm%d", port->dev_num); "issm%d", port->dev_num);
if (IS_ERR(port->sm_dev)) if (IS_ERR(port->sm_dev))
goto err_sm_cdev; goto err_sm_cdev;
dev_set_drvdata(port->dev, port);
dev_set_drvdata(port->sm_dev, port);
if (device_create_file(port->sm_dev, &dev_attr_ibdev)) if (device_create_file(port->sm_dev, &dev_attr_ibdev))
goto err_sm_dev; goto err_sm_dev;
if (device_create_file(port->sm_dev, &dev_attr_port)) if (device_create_file(port->sm_dev, &dev_attr_port))
......
...@@ -755,14 +755,15 @@ static void ib_uverbs_add_one(struct ib_device *device) ...@@ -755,14 +755,15 @@ static void ib_uverbs_add_one(struct ib_device *device)
if (cdev_add(uverbs_dev->cdev, IB_UVERBS_BASE_DEV + uverbs_dev->devnum, 1)) if (cdev_add(uverbs_dev->cdev, IB_UVERBS_BASE_DEV + uverbs_dev->devnum, 1))
goto err_cdev; goto err_cdev;
uverbs_dev->dev = device_create(uverbs_class, device->dma_device, uverbs_dev->dev = device_create_drvdata(uverbs_class,
uverbs_dev->cdev->dev, device->dma_device,
"uverbs%d", uverbs_dev->devnum); uverbs_dev->cdev->dev,
uverbs_dev,
"uverbs%d",
uverbs_dev->devnum);
if (IS_ERR(uverbs_dev->dev)) if (IS_ERR(uverbs_dev->dev))
goto err_cdev; goto err_cdev;
dev_set_drvdata(uverbs_dev->dev, uverbs_dev);
if (device_create_file(uverbs_dev->dev, &dev_attr_ibdev)) if (device_create_file(uverbs_dev->dev, &dev_attr_ibdev))
goto err_class; goto err_class;
if (device_create_file(uverbs_dev->dev, &dev_attr_abi_version)) if (device_create_file(uverbs_dev->dev, &dev_attr_abi_version))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment