* [PATCH 1/2] ALSA: gus: Fix erroneous memory allocation @ 2021-12-13 13:24 Takashi Iwai 2021-12-13 13:24 ` [PATCH 2/2] ALSA: gus: Fix memory leaks at error paths in memory allocations Takashi Iwai 2021-12-13 13:57 ` [PATCH 1/2] ALSA: gus: Fix erroneous memory allocation Jaroslav Kysela 0 siblings, 2 replies; 5+ messages in thread From: Takashi Iwai @ 2021-12-13 13:24 UTC (permalink / raw) To: alsa-devel; +Cc: Xiaoke Wang snd_gf1_mem_xalloc() returns NULL incorrectly when the memory chunk is allocated in the middle of the chain. This patch corrects the return value to treat it properly. Signed-off-by: Takashi Iwai <tiwai@suse.de> --- sound/isa/gus/gus_mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c index 4c691dbf2721..5e3ff3137dd7 100644 --- a/sound/isa/gus/gus_mem.c +++ b/sound/isa/gus/gus_mem.c @@ -44,7 +44,7 @@ static struct snd_gf1_mem_block *snd_gf1_mem_xalloc(struct snd_gf1_mem * alloc, else nblock->prev->next = nblock; mutex_unlock(&alloc->memory_mutex); - return NULL; + return nblock; } pblock = pblock->next; } -- 2.31.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ALSA: gus: Fix memory leaks at error paths in memory allocations 2021-12-13 13:24 [PATCH 1/2] ALSA: gus: Fix erroneous memory allocation Takashi Iwai @ 2021-12-13 13:24 ` Takashi Iwai 2021-12-13 14:02 ` Jaroslav Kysela 2021-12-13 13:57 ` [PATCH 1/2] ALSA: gus: Fix erroneous memory allocation Jaroslav Kysela 1 sibling, 1 reply; 5+ messages in thread From: Takashi Iwai @ 2021-12-13 13:24 UTC (permalink / raw) To: alsa-devel; +Cc: Xiaoke Wang When snd_gf1_mem_xalloc() returns NULL, the current code still leaves the formerly allocated block.name string but returns an error immediately. This patch covers the all callers to deal with the release of leftover name strings in the error paths. Signed-off-by: Takashi Iwai <tiwai@suse.de> --- sound/isa/gus/gus_mem.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c index 5e3ff3137dd7..1509e3e5d30e 100644 --- a/sound/isa/gus/gus_mem.c +++ b/sound/isa/gus/gus_mem.c @@ -204,6 +204,8 @@ struct snd_gf1_mem_block *snd_gf1_mem_alloc(struct snd_gf1_mem * alloc, int owne return NULL; } nblock = snd_gf1_mem_xalloc(alloc, &block); + if (!nblock) + kfree(block.name); snd_gf1_mem_lock(alloc, 1); return nblock; } @@ -241,14 +243,22 @@ int snd_gf1_mem_init(struct snd_gus_card * gus) block.ptr = 0; block.size = 1024; block.name = kstrdup("InterWave LFOs", GFP_KERNEL); - if (block.name == NULL || snd_gf1_mem_xalloc(alloc, &block) == NULL) + if (block.name == NULL) return -ENOMEM; + if (snd_gf1_mem_xalloc(alloc, &block) == NULL) { + kfree(block.name); + return -ENOMEM; + } } block.ptr = gus->gf1.default_voice_address; block.size = 4; block.name = kstrdup("Voice default (NULL's)", GFP_KERNEL); - if (block.name == NULL || snd_gf1_mem_xalloc(alloc, &block) == NULL) + if (block.name == NULL) return -ENOMEM; + if (snd_gf1_mem_xalloc(alloc, &block) == NULL) { + kfree(block.name); + return -ENOMEM; + } #ifdef CONFIG_SND_DEBUG snd_card_ro_proc_new(gus->card, "gusmem", gus, snd_gf1_mem_info_read); #endif -- 2.31.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ALSA: gus: Fix memory leaks at error paths in memory allocations 2021-12-13 13:24 ` [PATCH 2/2] ALSA: gus: Fix memory leaks at error paths in memory allocations Takashi Iwai @ 2021-12-13 14:02 ` Jaroslav Kysela 2021-12-13 14:06 ` Takashi Iwai 0 siblings, 1 reply; 5+ messages in thread From: Jaroslav Kysela @ 2021-12-13 14:02 UTC (permalink / raw) To: Takashi Iwai; +Cc: ALSA development On 13. 12. 21 14:24, Takashi Iwai wrote: > When snd_gf1_mem_xalloc() returns NULL, the current code still leaves > the formerly allocated block.name string but returns an error > immediately. This patch covers the all callers to deal with the > release of leftover name strings in the error paths. > > Signed-off-by: Takashi Iwai <tiwai@suse.de> It may be easier to pass the name to snd_gf1_mem_xalloc() - the code flow is more readable: diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c index ff9480f249fe..cd087267b3ea 100644 --- a/sound/isa/gus/gus_mem.c +++ b/sound/isa/gus/gus_mem.c @@ -25,14 +25,22 @@ void snd_gf1_mem_lock(struct snd_gf1_mem * alloc, int xup) } static struct snd_gf1_mem_block *snd_gf1_mem_xalloc(struct snd_gf1_mem * alloc, - struct snd_gf1_mem_block * block) + struct snd_gf1_mem_block * block, + const char * _name) { struct snd_gf1_mem_block *pblock, *nblock; + char *name; + name = kstrdup(_name, GFP_KERNEL); + if (name == NULL) + return NULL nblock = kmalloc(sizeof(struct snd_gf1_mem_block), GFP_KERNEL); - if (nblock == NULL) + if (nblock == NULL) { + kfree(name); return NULL; + } *nblock = *block; + nblock->name = name; pblock = alloc->first; while (pblock) { if (pblock->ptr > nblock->ptr) { @@ -198,8 +206,7 @@ struct snd_gf1_mem_block *snd_gf1_mem_alloc(struct snd_gf1_mem * alloc, int owne if (share_id != NULL) memcpy(&block.share_id, share_id, sizeof(block.share_id)); block.owner = owner; - block.name = kstrdup(name, GFP_KERNEL); - nblock = snd_gf1_mem_xalloc(alloc, &block); + nblock = snd_gf1_mem_xalloc(alloc, &block, name); snd_gf1_mem_lock(alloc, 1); return nblock; } @@ -236,14 +243,12 @@ int snd_gf1_mem_init(struct snd_gus_card * gus) if (gus->gf1.enh_mode) { block.ptr = 0; block.size = 1024; - block.name = kstrdup("InterWave LFOs", GFP_KERNEL); - if (snd_gf1_mem_xalloc(alloc, &block) == NULL) + if (snd_gf1_mem_xalloc(alloc, &block, "InterWave LFOs") == NULL) return -ENOMEM; } block.ptr = gus->gf1.default_voice_address; block.size = 4; - block.name = kstrdup("Voice default (NULL's)", GFP_KERNEL); - if (snd_gf1_mem_xalloc(alloc, &block) == NULL) + if (snd_gf1_mem_xalloc(alloc, &block, "Voice default (NULL's)") == NULL) return -ENOMEM; #ifdef CONFIG_SND_DEBUG snd_card_ro_proc_new(gus->card, "gusmem", gus, snd_gf1_mem_info_read); Jaroslav -- Jaroslav Kysela <perex@perex.cz> Linux Sound Maintainer; ALSA Project; Red Hat, Inc. ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ALSA: gus: Fix memory leaks at error paths in memory allocations 2021-12-13 14:02 ` Jaroslav Kysela @ 2021-12-13 14:06 ` Takashi Iwai 0 siblings, 0 replies; 5+ messages in thread From: Takashi Iwai @ 2021-12-13 14:06 UTC (permalink / raw) To: Jaroslav Kysela; +Cc: ALSA development On Mon, 13 Dec 2021 15:02:46 +0100, Jaroslav Kysela wrote: > > On 13. 12. 21 14:24, Takashi Iwai wrote: > > When snd_gf1_mem_xalloc() returns NULL, the current code still leaves > > the formerly allocated block.name string but returns an error > > immediately. This patch covers the all callers to deal with the > > release of leftover name strings in the error paths. > > > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > > It may be easier to pass the name to snd_gf1_mem_xalloc() - the code flow is more readable: (snip) Thanks, looks like a good idea. Since the kstrdup() NULL check fix was already applied, I'll resubmit with the new one. Takashi ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ALSA: gus: Fix erroneous memory allocation 2021-12-13 13:24 [PATCH 1/2] ALSA: gus: Fix erroneous memory allocation Takashi Iwai 2021-12-13 13:24 ` [PATCH 2/2] ALSA: gus: Fix memory leaks at error paths in memory allocations Takashi Iwai @ 2021-12-13 13:57 ` Jaroslav Kysela 1 sibling, 0 replies; 5+ messages in thread From: Jaroslav Kysela @ 2021-12-13 13:57 UTC (permalink / raw) To: Takashi Iwai; +Cc: ALSA development On 13. 12. 21 14:24, Takashi Iwai wrote: > snd_gf1_mem_xalloc() returns NULL incorrectly when the memory chunk is > allocated in the middle of the chain. This patch corrects the return > value to treat it properly. > > Signed-off-by: Takashi Iwai <tiwai@suse.de> Reviewed-by: Jaroslav Kysela <perex@perex.cz> Thanks, Jaroslav -- Jaroslav Kysela <perex@perex.cz> Linux Sound Maintainer; ALSA Project; Red Hat, Inc. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-12-13 14:07 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-12-13 13:24 [PATCH 1/2] ALSA: gus: Fix erroneous memory allocation Takashi Iwai 2021-12-13 13:24 ` [PATCH 2/2] ALSA: gus: Fix memory leaks at error paths in memory allocations Takashi Iwai 2021-12-13 14:02 ` Jaroslav Kysela 2021-12-13 14:06 ` Takashi Iwai 2021-12-13 13:57 ` [PATCH 1/2] ALSA: gus: Fix erroneous memory allocation Jaroslav Kysela
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.