From patchwork Sat Jan 11 09:49:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 234181 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=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 4E957C33C9E for ; Sat, 11 Jan 2020 10:01:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 232C520848 for ; Sat, 11 Jan 2020 10:01:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578736890; bh=bDANlImqzOWC7Mbdrh57R0b9pLFSzdomDK9sy7LxT8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MEzrrD+TEk2BTfanho1E3QfvdLzhf7Jq+VEvwTSeZHA6nmqIa1v/R4GX1t59rxJy9 MidTnhT7lCrBNbU0FjBWEwTLCyBYbuR2p27E+zvwgCV7Yu8KeLlWSSuWooORrCXYpc KcdVmOHR2gwTz5eydVmiACEx54K4yE23Z/9uWWrU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729191AbgAKKB3 (ORCPT ); Sat, 11 Jan 2020 05:01:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:58832 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729143AbgAKKB2 (ORCPT ); Sat, 11 Jan 2020 05:01:28 -0500 Received: from localhost (unknown [62.119.166.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B076E2077C; Sat, 11 Jan 2020 10:01:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578736888; bh=bDANlImqzOWC7Mbdrh57R0b9pLFSzdomDK9sy7LxT8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bvCiahLWOOZMH/i3jHNmNfmY5zZkgIYaOy4PobFf89OiEWDLNt5H3fVItrUUr6JG+ V3eA1HI+BZds0roNr1zhhE3HK8bzFZ2sWvgMmx5WAFZDP1CQGhP69wK6oDhh6VLlus AvHYkket+Q2o1W3ayGW39V4t5y+rqNEqYoQ6/hBw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Navid Emamdoost , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 4.9 42/91] media: usb: fix memory leak in af9005_identify_state Date: Sat, 11 Jan 2020 10:49:35 +0100 Message-Id: <20200111094900.993167576@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094844.748507863@linuxfoundation.org> References: <20200111094844.748507863@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Navid Emamdoost commit 2289adbfa559050d2a38bcd9caac1c18b800e928 upstream. In af9005_identify_state when returning -EIO the allocated buffer should be released. Replace the "return -EIO" with assignment into ret and move deb_info() under a check. Fixes: af4e067e1dcf ("V4L/DVB (5625): Add support for the AF9005 demodulator from Afatech") Signed-off-by: Navid Emamdoost Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/usb/dvb-usb/af9005.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/media/usb/dvb-usb/af9005.c +++ b/drivers/media/usb/dvb-usb/af9005.c @@ -990,8 +990,9 @@ static int af9005_identify_state(struct else if (reply == 0x02) *cold = 0; else - return -EIO; - deb_info("Identify state cold = %d\n", *cold); + ret = -EIO; + if (!ret) + deb_info("Identify state cold = %d\n", *cold); err: kfree(buf);