ALSA: proc: Avoid possible leaks of snd_info_entry objects
This patch changes the parent pointer assignment of snd_info_entry object to be always non-NULL. More specifically,check the parent argument in snd_info_create_module_entry() & co, and assign snd_proc_root if NULL is passed there. This assures that the proc object is always freed when the root is freed, so avoid possible memory leaks. For example, some error paths (e.g. snd_info_register() error at snd_minor_info_init()) may leave snd_info_entry object although the proc file itself is freed. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Родитель
480e32ebd5
Коммит
3a55437141
|
@ -741,7 +741,11 @@ struct snd_info_entry *snd_info_create_module_entry(struct module * module,
|
|||
const char *name,
|
||||
struct snd_info_entry *parent)
|
||||
{
|
||||
struct snd_info_entry *entry = snd_info_create_entry(name, parent);
|
||||
struct snd_info_entry *entry;
|
||||
|
||||
if (!parent)
|
||||
parent = snd_proc_root;
|
||||
entry = snd_info_create_entry(name, parent);
|
||||
if (entry)
|
||||
entry->module = module;
|
||||
return entry;
|
||||
|
@ -762,7 +766,11 @@ struct snd_info_entry *snd_info_create_card_entry(struct snd_card *card,
|
|||
const char *name,
|
||||
struct snd_info_entry * parent)
|
||||
{
|
||||
struct snd_info_entry *entry = snd_info_create_entry(name, parent);
|
||||
struct snd_info_entry *entry;
|
||||
|
||||
if (!parent)
|
||||
parent = card->proc_root;
|
||||
entry = snd_info_create_entry(name, parent);
|
||||
if (entry) {
|
||||
entry->module = card->module;
|
||||
entry->card = card;
|
||||
|
|
Загрузка…
Ссылка в новой задаче