From patchwork Mon Mar 13 12:53:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 40000 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cnPXH-0005MQ-Ri; Mon, 13 Mar 2017 12:57:15 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-8) with esmtp id 1cnPXE-00008I-kz; Mon, 13 Mar 2017 13:57:15 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753149AbdCMM4A (ORCPT + 1 other); Mon, 13 Mar 2017 08:56:00 -0400 Received: from mail-lf0-f67.google.com ([209.85.215.67]:33965 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750871AbdCMMyf (ORCPT ); Mon, 13 Mar 2017 08:54:35 -0400 Received: by mail-lf0-f67.google.com with SMTP id y193so11761111lfd.1; Mon, 13 Mar 2017 05:54:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=7UTiOVTZUMMnieKeYhzENcx9tB3J8B4rI2gtJmELQos=; b=gpv65Z/H3spjY6fVXSkVE/eR2/VE1tPabF4iUBCrBSHRmygMCyTkvqbGcUaFOym+jo Fbh6hUU1uAi81uWlYVkD+R8lXLYdbdhlN6uID4VSmQQnpburZV7kLsVW6I7QaZLsVRHL l4DgxIe041OVY5kwbPv8TozYPgssUD+mTdUDhdLO+t2nCLMUFJL3PvQgtXjrAsQA17zZ G4E/GKA7UbkbjD3v9LgjDfCuACpkxDjACo9kno5AUMaft52wmdTfZArA3q+5GVZToDtj e1LRxtENF0dWAhcmvnoPbHcvoxdVXT3FiIvbx4Xg1jTSt3RhQgqRIJlWuX8Dx0CdPYGD DUmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=7UTiOVTZUMMnieKeYhzENcx9tB3J8B4rI2gtJmELQos=; b=jIE4qsNvnhU+682O188/4xbu++j7Nn/I9slxGgD5ThnHHWERjdwN/r9IPDA3A5TuGo OIA5lxVmoRMhRBA4bCxKk1wssrgLFBgtmAt1GNgSGMJJ6pljQh8Ju5h/K63YalPXvTuF 7qk4Ar7V0rKo8/lWRxwvagkpDmZtvMqFIxkA4rDLu+BPw9l0ZpFAcutMhw7bNwOFq+16 38G16qY+7+3xlVKtv5vAB3NGRsmFRRAwHNECL7QDG3yZUKh0TJdwVsQwDOk0L4QOOo/O LcaZ32rs79qotf12N0QsdAMh+EPFdrtqJ6JE4dg03upWhjdzaA49DhNrP9T/qAdd+ryt yjGw== X-Gm-Message-State: AMke39n7Ek7KzloleUZdDxj0keTGnWy69pxG5uro2b+TMgWm0atgSOdcKe1YYBiF75idSw== X-Received: by 10.25.25.14 with SMTP id 14mr8280109lfz.153.1489409672885; Mon, 13 Mar 2017 05:54:32 -0700 (PDT) Received: from xi.terra ([84.216.234.102]) by smtp.gmail.com with ESMTPSA id t19sm3539354ljd.30.2017.03.13.05.54.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Mar 2017 05:54:31 -0700 (PDT) Received: from johan by xi.terra with local (Exim 4.89) (envelope-from ) id 1cnPUU-0007fB-9F; Mon, 13 Mar 2017 13:54:22 +0100 From: Johan Hovold To: Mauro Carvalho Chehab Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable , Sri Deevi Subject: [PATCH 4/6] [media] cx231xx-audio: fix init error path Date: Mon, 13 Mar 2017 13:53:57 +0100 Message-Id: <20170313125359.29394-5-johan@kernel.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170313125359.29394-1-johan@kernel.org> References: <20170313125359.29394-1-johan@kernel.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.3.13.124518 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1900_1999 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, ECARD_WORD 0, FROM_SAME_AS_TO_DOMAIN 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __FROM_DOMAIN_IN_ANY_CC2 0, __FROM_DOMAIN_IN_ANY_TO2 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MULTIPLE_RCPTS_CC_X2 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __TO_SAME_AS_FROM_DOMAIN 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Make sure to release the snd_card also on a late allocation error. Fixes: e0d3bafd0258 ("V4L/DVB (10954): Add cx231xx USB driver") Cc: stable # 2.6.30 Cc: Sri Deevi Signed-off-by: Johan Hovold --- drivers/media/usb/cx231xx/cx231xx-audio.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/media/usb/cx231xx/cx231xx-audio.c b/drivers/media/usb/cx231xx/cx231xx-audio.c index cf80842dfa08..f3729d6eb46a 100644 --- a/drivers/media/usb/cx231xx/cx231xx-audio.c +++ b/drivers/media/usb/cx231xx/cx231xx-audio.c @@ -670,10 +670,8 @@ static int cx231xx_audio_init(struct cx231xx *dev) spin_lock_init(&adev->slock); err = snd_pcm_new(card, "Cx231xx Audio", 0, 0, 1, &pcm); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto err_free_card; snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_cx231xx_pcm_capture); @@ -687,10 +685,9 @@ static int cx231xx_audio_init(struct cx231xx *dev) INIT_WORK(&dev->wq_trigger, audio_trigger); err = snd_card_register(card); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto err_free_card; + adev->sndcard = card; adev->udev = dev->udev; @@ -709,9 +706,10 @@ static int cx231xx_audio_init(struct cx231xx *dev) "audio EndPoint Addr 0x%x, Alternate settings: %i\n", adev->end_point_addr, adev->num_alt); adev->alt_max_pkt_size = kmalloc(32 * adev->num_alt, GFP_KERNEL); - - if (adev->alt_max_pkt_size == NULL) - return -ENOMEM; + if (!adev->alt_max_pkt_size) { + err = -ENOMEM; + goto err_free_card; + } for (i = 0; i < adev->num_alt; i++) { u16 tmp = @@ -725,6 +723,11 @@ static int cx231xx_audio_init(struct cx231xx *dev) } return 0; + +err_free_card: + snd_card_free(card); + + return err; } static int cx231xx_audio_fini(struct cx231xx *dev)