3.5.7.15 -stable review patch. If anyone has any objections, please let me know.
------------------ From: Al Viro <[email protected]> commit dd6c5cd8fedddc9605209098e2fa4e82c7af22aa upstream. in case when snd_pcm_stream_linked(substream) is true, we end up leaking group. Signed-off-by: Al Viro <[email protected]> Cc: Jonghwan Choi <[email protected]> Signed-off-by: Luis Henriques <[email protected]> --- sound/core/pcm_native.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 7203c9a..ffb9153 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1633,6 +1633,7 @@ static int snd_pcm_link(struct snd_pcm_substream *substream, int fd) } if (!snd_pcm_stream_linked(substream)) { substream->group = group; + group = NULL; spin_lock_init(&substream->group->lock); INIT_LIST_HEAD(&substream->group->substreams); list_add_tail(&substream->link_list, &substream->group->substreams); @@ -1647,8 +1648,7 @@ static int snd_pcm_link(struct snd_pcm_substream *substream, int fd) _nolock: snd_card_unref(substream1->pcm->card); fput(file); - if (res < 0) - kfree(group); + kfree(group); return res; } -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
