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=-6.8 required=3.0 tests=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 182CBCA9EA0 for ; Mon, 28 Oct 2019 06:31:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E56BF20862 for ; Mon, 28 Oct 2019 06:31:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731926AbfJ1Gbh (ORCPT ); Mon, 28 Oct 2019 02:31:37 -0400 Received: from mx2.suse.de ([195.135.220.15]:41636 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730425AbfJ1Gbh (ORCPT ); Mon, 28 Oct 2019 02:31:37 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id CA756B3C7; Mon, 28 Oct 2019 06:31:35 +0000 (UTC) Date: Mon, 28 Oct 2019 07:31:35 +0100 Message-ID: From: Takashi Iwai To: Navid Emamdoost Cc: emamd001@umn.edu, smccaman@umn.edu, kjlu@umn.edu, Jaroslav Kysela , Takashi Iwai , Greg Kroah-Hartman , Richard Fontana , Thomas Gleixner , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ALSA: pci: Fix memory leak in snd_korg1212_create In-Reply-To: <20191027191206.30820-1-navid.emamdoost@gmail.com> References: <20191027191206.30820-1-navid.emamdoost@gmail.com> 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 Sun, 27 Oct 2019 20:12:04 +0100, Navid Emamdoost wrote: > > In the implementation of snd_korg1212_create() the allocated memory for > korg1212 is leaked in cases of error. Release korg1212 via > snd_korg1212_free() if either of these calls fail: > snd_korg1212_downloadDSPCode(), snd_pcm_new(), or snd_ctl_add(). This also leads to the double-free. The code path is after snd_device_new() which has its own destructor callback. thanks, Takashi > > Signed-off-by: Navid Emamdoost > --- > sound/pci/korg1212/korg1212.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c > index 0d81eac0a478..e976e857d915 100644 > --- a/sound/pci/korg1212/korg1212.c > +++ b/sound/pci/korg1212/korg1212.c > @@ -2367,8 +2367,10 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, > > mdelay(CARD_BOOT_DELAY_IN_MS); > > - if (snd_korg1212_downloadDSPCode(korg1212)) > + if (snd_korg1212_downloadDSPCode(korg1212)) { > + snd_korg1212_free(korg1212); > return -EBUSY; > + } > > K1212_DEBUG_PRINTK("korg1212: dspMemPhy = %08x U[%08x], " > "PlayDataPhy = %08x L[%08x]\n" > @@ -2383,8 +2385,11 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, > korg1212->RoutingTablePhy, LowerWordSwap(korg1212->RoutingTablePhy), > korg1212->AdatTimeCodePhy, LowerWordSwap(korg1212->AdatTimeCodePhy)); > > - if ((err = snd_pcm_new(korg1212->card, "korg1212", 0, 1, 1, &korg1212->pcm)) < 0) > + err = snd_pcm_new(korg1212->card, "korg1212", 0, 1, 1, &korg1212->pcm); > + if (err < 0) { > + snd_korg1212_free(korg1212); > return err; > + } > > korg1212->pcm->private_data = korg1212; > korg1212->pcm->private_free = snd_korg1212_free_pcm; > @@ -2398,8 +2403,10 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, > > for (i = 0; i < ARRAY_SIZE(snd_korg1212_controls); i++) { > err = snd_ctl_add(korg1212->card, snd_ctl_new1(&snd_korg1212_controls[i], korg1212)); > - if (err < 0) > + if (err < 0) { > + snd_korg1212_free(korg1212); > return err; > + } > } > > snd_korg1212_proc_init(korg1212); > -- > 2.17.1 > 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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 50BB5CA9EA0 for ; Mon, 28 Oct 2019 06:40:01 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C839120862 for ; Mon, 28 Oct 2019 06:40:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="szjOtrZ4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C839120862 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 906C51A9B; Mon, 28 Oct 2019 07:31:40 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 906C51A9B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1572244350; bh=2+PL+Oq123ivgk4j1cjLsDmfktZ7G2VY0t2+2vIfRww=; h=Date:From:To:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=szjOtrZ4byyInjcTyPtZv1HSh8gwpzDIWuvtW+6D7AHpaeSgk8TDSjTIehF3bNvj6 +LHf4LWAkoFyFpOm0lc10uNPtEtsLeFg2MFFtS2/dh5vmvbPxpjezt5+rRmikiiM73 3SkNwxhRw85/RrsKgEZfw4cd+mg4chFjVBGwT7z4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 10146F80361; Mon, 28 Oct 2019 07:31:40 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A80F8F803D6; Mon, 28 Oct 2019 07:31:38 +0100 (CET) Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 60902F80145 for ; Mon, 28 Oct 2019 07:31:36 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 60902F80145 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id CA756B3C7; Mon, 28 Oct 2019 06:31:35 +0000 (UTC) Date: Mon, 28 Oct 2019 07:31:35 +0100 Message-ID: From: Takashi Iwai To: Navid Emamdoost In-Reply-To: <20191027191206.30820-1-navid.emamdoost@gmail.com> References: <20191027191206.30820-1-navid.emamdoost@gmail.com> 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") Cc: alsa-devel@alsa-project.org, Greg Kroah-Hartman , kjlu@umn.edu, Takashi Iwai , Richard Fontana , emamd001@umn.edu, smccaman@umn.edu, Thomas Gleixner , linux-kernel@vger.kernel.org Subject: Re: [alsa-devel] [PATCH] ALSA: pci: Fix memory leak in snd_korg1212_create X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On Sun, 27 Oct 2019 20:12:04 +0100, Navid Emamdoost wrote: > > In the implementation of snd_korg1212_create() the allocated memory for > korg1212 is leaked in cases of error. Release korg1212 via > snd_korg1212_free() if either of these calls fail: > snd_korg1212_downloadDSPCode(), snd_pcm_new(), or snd_ctl_add(). This also leads to the double-free. The code path is after snd_device_new() which has its own destructor callback. thanks, Takashi > > Signed-off-by: Navid Emamdoost > --- > sound/pci/korg1212/korg1212.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c > index 0d81eac0a478..e976e857d915 100644 > --- a/sound/pci/korg1212/korg1212.c > +++ b/sound/pci/korg1212/korg1212.c > @@ -2367,8 +2367,10 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, > > mdelay(CARD_BOOT_DELAY_IN_MS); > > - if (snd_korg1212_downloadDSPCode(korg1212)) > + if (snd_korg1212_downloadDSPCode(korg1212)) { > + snd_korg1212_free(korg1212); > return -EBUSY; > + } > > K1212_DEBUG_PRINTK("korg1212: dspMemPhy = %08x U[%08x], " > "PlayDataPhy = %08x L[%08x]\n" > @@ -2383,8 +2385,11 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, > korg1212->RoutingTablePhy, LowerWordSwap(korg1212->RoutingTablePhy), > korg1212->AdatTimeCodePhy, LowerWordSwap(korg1212->AdatTimeCodePhy)); > > - if ((err = snd_pcm_new(korg1212->card, "korg1212", 0, 1, 1, &korg1212->pcm)) < 0) > + err = snd_pcm_new(korg1212->card, "korg1212", 0, 1, 1, &korg1212->pcm); > + if (err < 0) { > + snd_korg1212_free(korg1212); > return err; > + } > > korg1212->pcm->private_data = korg1212; > korg1212->pcm->private_free = snd_korg1212_free_pcm; > @@ -2398,8 +2403,10 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, > > for (i = 0; i < ARRAY_SIZE(snd_korg1212_controls); i++) { > err = snd_ctl_add(korg1212->card, snd_ctl_new1(&snd_korg1212_controls[i], korg1212)); > - if (err < 0) > + if (err < 0) { > + snd_korg1212_free(korg1212); > return err; > + } > } > > snd_korg1212_proc_init(korg1212); > -- > 2.17.1 > _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel