Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5fb920a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

s390: 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>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5d99a8b8

drivers/s390/char/vmlogrdr.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -762,10 +762,10 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv) 
		device_unregister(dev);

		device_unregister(dev);

		return ret;

		return ret;

	}

	}

	priv->class_device = device_create(vmlogrdr_class, dev,

	priv->class_device = device_create_drvdata(vmlogrdr_class, dev,

						   MKDEV(vmlogrdr_major,

						   MKDEV(vmlogrdr_major,

							 priv->minor_num),

							 priv->minor_num),

					   "%s", dev->bus_id);

						   priv, "%s", dev->bus_id);

	if (IS_ERR(priv->class_device)) {

	if (IS_ERR(priv->class_device)) {

		ret = PTR_ERR(priv->class_device);

		ret = PTR_ERR(priv->class_device);

		priv->class_device=NULL;

		priv->class_device=NULL;
@@ -773,7 +773,6 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv) 
		device_unregister(dev);

		device_unregister(dev);

		return ret;

		return ret;

	}

	}

	dev->driver_data = priv;

	priv->device = dev;

	priv->device = dev;

	return 0;

	return 0;

}

}