From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 656D5C433E0 for ; Mon, 10 Aug 2020 06:54:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4A987206B5 for ; Mon, 10 Aug 2020 06:54:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726021AbgHJGyR (ORCPT ); Mon, 10 Aug 2020 02:54:17 -0400 Received: from mx2.suse.de ([195.135.220.15]:47632 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725774AbgHJGyQ (ORCPT ); Mon, 10 Aug 2020 02:54:16 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 90DD3AC1D; Mon, 10 Aug 2020 06:54:35 +0000 (UTC) Date: Mon, 10 Aug 2020 08:54:15 +0200 Message-ID: From: Takashi Iwai To: Dinghao Liu Cc: kjlu@umn.edu, Jaroslav Kysela , Takashi Iwai , Mark Hills , Dan Carpenter , Arnd Bergmann , Pierre-Louis Bossart , Takashi Sakamoto , Giuliano Pochini , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ALSA: echoaudio: Fix memory leak in snd_echo_resume() In-Reply-To: <20200810061500.9329-1-dinghao.liu@zju.edu.cn> References: <20200810061500.9329-1-dinghao.liu@zju.edu.cn> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 10 Aug 2020 08:14:58 +0200, Dinghao Liu wrote: > > When restore_dsp_rettings() fails, chip should be freed > just like when init_hw() and request_irq() fails. > > Fixes: 47b5d028fdce8 ("ALSA: Echoaudio - Add suspend support #2") > Signed-off-by: Dinghao Liu Actually it's rather wrong to call snd_echo_free() in the resume error path. This may lead to an Oops at the next time the system goes to resume. That said, we should drop snd_echo_free() calls in other error paths in snd_echo_resume() instead. thanks, Takashi > --- > sound/pci/echoaudio/echoaudio.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c > index 6aeb99aa2414..2aa183fe5dc1 100644 > --- a/sound/pci/echoaudio/echoaudio.c > +++ b/sound/pci/echoaudio/echoaudio.c > @@ -2226,6 +2226,7 @@ static int snd_echo_resume(struct device *dev) > chip->pipe_alloc_mask = pipe_alloc_mask; > if (err < 0) { > kfree(commpage_bak); > + snd_echo_free(chip); > return err; > } > > -- > 2.17.1 >