summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorWenwen Wang <wenwen@cs.uga.edu>2019-08-08 08:15:21 +0300
committerTakashi Iwai <tiwai@suse.de>2019-08-08 09:18:32 +0300
commitc7cd7c748a3250ca33509f9235efab9c803aca09 (patch)
tree159ab4582286ab702dd0db9c84904a968ab325df /sound
parentc02f77d32d2c45cfb1b2bb99eabd8a78f5ecc7db (diff)
downloadlinux-c7cd7c748a3250ca33509f9235efab9c803aca09.tar.xz
sound: fix a memory leak bug
In sound_insert_unit(), the controlling structure 's' is allocated through kmalloc(). Then it is added to the sound driver list by invoking __sound_insert_unit(). Later on, if __register_chrdev() fails, 's' is removed from the list through __sound_remove_unit(). If 'index' is not less than 0, -EBUSY is returned to indicate the error. However, 's' is not deallocated on this execution path, leading to a memory leak bug. To fix the above issue, free 's' before -EBUSY is returned. Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/sound_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/sound_core.c b/sound/sound_core.c
index b730d97c4de6..90d118cd9164 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -275,7 +275,8 @@ retry:
goto retry;
}
spin_unlock(&sound_loader_lock);
- return -EBUSY;
+ r = -EBUSY;
+ goto fail;
}
}