Skip to content

Commit

Permalink
SOUND: fix race in device_create
Browse files Browse the repository at this point in the history
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: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed May 20, 2008
1 parent 43691da commit 5d99a8b
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions sound/core/sound.c
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,9 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev,
return minor;
}
snd_minors[minor] = preg;
preg->dev = device_create(sound_class, device, MKDEV(major, minor),
"%s", name);
preg->dev = device_create_drvdata(sound_class, device,
MKDEV(major, minor),
private_data, "%s", name);
if (IS_ERR(preg->dev)) {
snd_minors[minor] = NULL;
mutex_unlock(&sound_mutex);
Expand All @@ -269,9 +270,6 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev,
return minor;
}

if (preg->dev)
dev_set_drvdata(preg->dev, private_data);

mutex_unlock(&sound_mutex);
return 0;
}
Expand Down

0 comments on commit 5d99a8b

Please sign in to comment.