diff options
author | Jesper Juhl <jj@chaosbits.net> | 2011-01-06 22:19:47 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-01-10 11:13:42 +0100 |
commit | 3daa7ea650d59ae86926f0ced4c4ccd99ab33fda (patch) | |
tree | 775ded9a8f63af06d45c79fceac55be3126c36f6 /sound/core | |
parent | 689c69120ea3c8db069e11a7065ceffee90d0460 (diff) | |
download | talos-op-linux-3daa7ea650d59ae86926f0ced4c4ccd99ab33fda.tar.gz talos-op-linux-3daa7ea650d59ae86926f0ced4c4ccd99ab33fda.zip |
ALSA: Don't leak in sound/core/oss/pcm_oss.c::snd_pcm_hw_param_near()
snd_pcm_hw_param_near() will leak the memory allocated to 'save' if the
call to snd_pcm_hw_param_max() returns less than zero.
This patch makes sure we never leak.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r-- | sound/core/oss/pcm_oss.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index b753ec661fcf..a2e4eb324699 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c @@ -453,8 +453,10 @@ static int snd_pcm_hw_param_near(struct snd_pcm_substream *pcm, } else { *params = *save; max = snd_pcm_hw_param_max(pcm, params, var, max, &maxdir); - if (max < 0) + if (max < 0) { + kfree(save); return max; + } last = 1; } _end: |