diff options
| author | Mariusz Kozlowski <m.kozlowski@tuxland.pl> | 2007-10-09 10:34:06 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 16:51:06 +0200 |
| commit | 2469049e728ee0542d6617f81311a18a14e73826 (patch) | |
| tree | 4a6d5f67c89107f01271f3fff28568928e8b29d1 /sound/core/sound.c | |
| parent | 1e74190bc0f8a5ab7e83bdf6688fcaebbed25316 (diff) | |
| download | linux-2469049e728ee0542d6617f81311a18a14e73826.tar.bz2 | |
[ALSA] sound: snd_register_device_for_dev fix
snd_register_device_for_dev() can oops when device_create() returns
ERR_PTR(err).
Scenario:
preg->dev = device_create(...); /* fails */
if (preg->dev) /* contains ERR_PTR(err) */
dev_set_drvdata(preg->dev, private_data);
and dev_set_drvdata() looks like this:
static inline void
dev_set_drvdata (struct device *dev, void *data)
{
dev->driver_data = data; <--- boom
}
This patch should prevent that.
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/core/sound.c')
| -rw-r--r-- | sound/core/sound.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/core/sound.c b/sound/core/sound.c index 8dc7a3b32b98..f6ebce08b537 100644 --- a/sound/core/sound.c +++ b/sound/core/sound.c @@ -266,6 +266,14 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev, snd_minors[minor] = preg; preg->dev = device_create(sound_class, device, MKDEV(major, minor), "%s", name); + if (IS_ERR(preg->dev)) { + snd_minors[minor] = NULL; + mutex_unlock(&sound_mutex); + minor = PTR_ERR(preg->dev); + kfree(preg); + return minor; + } + if (preg->dev) dev_set_drvdata(preg->dev, private_data); |