From patchwork Mon Jan 26 12:47:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 5709211 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C9AFB9F1D6 for ; Mon, 26 Jan 2015 12:47:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C740B20125 for ; Mon, 26 Jan 2015 12:47:53 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 6EA5F20121 for ; Mon, 26 Jan 2015 12:47:52 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 62B7C26059E; Mon, 26 Jan 2015 13:47:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id A46D0260554; Mon, 26 Jan 2015 13:47:43 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id E40A3260558; Mon, 26 Jan 2015 13:47:41 +0100 (CET) Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id EDE6426054F for ; Mon, 26 Jan 2015 13:47:34 +0100 (CET) Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id A71D7AB09; Mon, 26 Jan 2015 12:47:34 +0000 (UTC) Date: Mon, 26 Jan 2015 13:47:34 +0100 Message-ID: From: Takashi Iwai To: Chris Rorvick In-Reply-To: References: <1422033203-23254-1-git-send-email-tiwai@suse.de> <1422033203-23254-3-git-send-email-tiwai@suse.de> 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/24.4 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Cc: Stefan Hajnoczi , alsa-devel@alsa-project.org Subject: Re: [alsa-devel] [PATCH 02/16] ALSA: line6: Fix memory leak at probe error path X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP At Sun, 25 Jan 2015 02:06:19 -0600, Chris Rorvick wrote: > > On Fri, Jan 23, 2015 at 11:13 AM, Takashi Iwai wrote: > > --- a/sound/usb/line6/driver.c > > +++ b/sound/usb/line6/driver.c > > @@ -507,10 +507,32 @@ int line6_probe(struct usb_interface *interface, > > int interface_number; > > int ret; > > > > + ret = snd_card_new(line6->ifcdev, > > + SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, > > + THIS_MODULE, 0, &card); > > The `ifcdev' member has not been initialized yet. Good catch. > You need something > like the following squashed in: > > >8------------------------------------------------------8< > diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c > index 2eed6fb..25d6b0f 100644 > --- a/sound/usb/line6/driver.c > +++ b/sound/usb/line6/driver.c > @@ -507,6 +507,11 @@ int line6_probe(struct usb_interface *interface, > int interface_number; > int ret; > > + /* store basic data: */ > + line6->properties = properties; > + line6->usbdev = usbdev; > + line6->ifcdev = &interface->dev; > + > ret = snd_card_new(line6->ifcdev, > SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, > THIS_MODULE, 0, &card); > @@ -548,11 +553,6 @@ int line6_probe(struct usb_interface *interface, > goto error; > } > > - /* store basic data: */ > - line6->properties = properties; > - line6->usbdev = usbdev; > - line6->ifcdev = &interface->dev; > - > line6_get_interval(line6); > > if (properties->capabilities & LINE6_CAP_CONTROL) { Right, but there will be another round of cleanup patches and the allocation of line6 will be dropped there, so I took an easier fixup, just use &interface->dev to the argument. The revised patch is found below. The test/line6 branch was updated with this (and more fixes I'll send shortly later). thanks, Takashi -- 8< -- From: Takashi Iwai Subject: [PATCH] ALSA: line6: Fix memory leak at probe error path Fix memory leak at probe error path by rearranging the call order in line6_destruct() so that the common destructor is always called. Also this simplifies the error path to a single goto label. Signed-off-by: Takashi Iwai --- sound/usb/line6/driver.c | 59 ++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index b783c0788e45..bf9630cd2395 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -507,39 +507,20 @@ int line6_probe(struct usb_interface *interface, int interface_number; int ret; - /* we don't handle multiple configurations */ - if (usbdev->descriptor.bNumConfigurations != 1) { - ret = -ENODEV; - goto err_put; - } - - /* initialize device info: */ - dev_info(&interface->dev, "Line 6 %s found\n", properties->name); - - /* query interface number */ - interface_number = interface->cur_altsetting->desc.bInterfaceNumber; - - ret = usb_set_interface(usbdev, interface_number, - properties->altsetting); + ret = snd_card_new(&interface->dev, + SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, + THIS_MODULE, 0, &card); if (ret < 0) { - dev_err(&interface->dev, "set_interface failed\n"); - goto err_put; + kfree(line6); + return ret; } /* store basic data: */ + line6->card = card; line6->properties = properties; line6->usbdev = usbdev; line6->ifcdev = &interface->dev; - line6_get_interval(line6); - - ret = snd_card_new(line6->ifcdev, - SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, - THIS_MODULE, 0, &card); - if (ret < 0) - goto err_put; - - line6->card = card; strcpy(card->id, line6->properties->id); strcpy(card->driver, DRIVER_NAME); strcpy(card->shortname, line6->properties->name); @@ -553,16 +534,37 @@ int line6_probe(struct usb_interface *interface, /* increment reference counters: */ usb_get_dev(usbdev); + /* we don't handle multiple configurations */ + if (usbdev->descriptor.bNumConfigurations != 1) { + ret = -ENODEV; + goto error; + } + + /* initialize device info: */ + dev_info(&interface->dev, "Line 6 %s found\n", properties->name); + + /* query interface number */ + interface_number = interface->cur_altsetting->desc.bInterfaceNumber; + + ret = usb_set_interface(usbdev, interface_number, + properties->altsetting); + if (ret < 0) { + dev_err(&interface->dev, "set_interface failed\n"); + goto error; + } + + line6_get_interval(line6); + if (properties->capabilities & LINE6_CAP_CONTROL) { ret = line6_init_cap_control(line6); if (ret < 0) - goto err_destruct; + goto error; } /* initialize device data based on device: */ ret = private_init(interface, line6); if (ret < 0) - goto err_destruct; + goto error; /* creation of additional special files should go here */ @@ -571,11 +573,10 @@ int line6_probe(struct usb_interface *interface, return 0; - err_destruct: + error: if (line6->disconnect) line6->disconnect(interface); snd_card_free(card); - err_put: return ret; } EXPORT_SYMBOL_GPL(line6_probe);