diff options
author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-04-12 06:56:10 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-07-12 14:07:23 -0400 |
commit | cb6dd2609779e55b34876d75a9092b1a1f513142 (patch) | |
tree | a61061cf2d4be2e55cdf04ba6378e68cff8e5a46 /sound/pcmcia | |
parent | b2d6744849b5bf6b4593b81c136772df7a238ac9 (diff) |
[ALSA] Memory leak in sound/pcmcia/pdaudiocf/pdaudiocf.c
if one of the first three CS_CHECKS fails, we goto cs_failed:
In this case parse we donr kfree() parse. Since the the last three
CS_CHECKS might also fail, i moved the kfree() below all the CS_CHECKs
and added one in the error path. This fixes coverity bug id #1099
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pcmcia')
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index adfdce7499d1..1c09e5f49da8 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c | |||
@@ -241,12 +241,13 @@ static int pdacf_config(struct pcmcia_device *link) | |||
241 | CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, parse)); | 241 | CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, parse)); |
242 | link->conf.ConfigBase = parse->config.base; | 242 | link->conf.ConfigBase = parse->config.base; |
243 | link->conf.ConfigIndex = 0x5; | 243 | link->conf.ConfigIndex = 0x5; |
244 | kfree(parse); | ||
245 | 244 | ||
246 | CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io)); | 245 | CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io)); |
247 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); | 246 | CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); |
248 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); | 247 | CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); |
249 | 248 | ||
249 | kfree(parse); | ||
250 | |||
250 | if (snd_pdacf_assign_resources(pdacf, link->io.BasePort1, link->irq.AssignedIRQ) < 0) | 251 | if (snd_pdacf_assign_resources(pdacf, link->io.BasePort1, link->irq.AssignedIRQ) < 0) |
251 | goto failed; | 252 | goto failed; |
252 | 253 | ||
@@ -254,6 +255,7 @@ static int pdacf_config(struct pcmcia_device *link) | |||
254 | return 0; | 255 | return 0; |
255 | 256 | ||
256 | cs_failed: | 257 | cs_failed: |
258 | kfree(parse); | ||
257 | cs_error(link, last_fn, last_ret); | 259 | cs_error(link, last_fn, last_ret); |
258 | failed: | 260 | failed: |
259 | pcmcia_disable_device(link); | 261 | pcmcia_disable_device(link); |