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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 CB184C432C3 for ; Tue, 3 Dec 2019 22:40:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 90EBD2073C for ; Tue, 3 Dec 2019 22:40:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575412819; bh=vUBQZr3skgGhnkUVrXHXn06oQboJ/0dP2cDMO1v6I80=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dq3Ny16LXrj0C2wBF42DYLKSZxbOQIPOR2CE7fPICgzkvJ/WuU8tFDzyH0K6sUg2Q Hbg0qRVUAiadpfbOPN39HyLZ0Pcb4fRGDz5F0wqzD0P4Neh+CdhcFK1iqqe7SLkHCS CIp7nmP2xZSK9+y7KOMsY+IWADd9tvqdZpVUiJd4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728375AbfLCWkS (ORCPT ); Tue, 3 Dec 2019 17:40:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:52138 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728364AbfLCWkL (ORCPT ); Tue, 3 Dec 2019 17:40:11 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 8E3E720684; Tue, 3 Dec 2019 22:40:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575412811; bh=vUBQZr3skgGhnkUVrXHXn06oQboJ/0dP2cDMO1v6I80=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cfySwlgzDDI+fX7vWGUWCRhRla8YdezRYPeEX66oYMdCLEJtyFHorRruOSdr3cNlq +4moWetOAE2//lo2Saet4lgWan9TsNgBexG62eMal0XNd4JJgHekR4fA2/J2YlVBhs Zk/9HQF2gjkchEQOkObmL2rZdAypEUz+heXRFL2A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Navid Emamdoost , Mark Brown , Sasha Levin Subject: [PATCH 5.3 025/135] ASoC: SOF: ipc: Fix memory leak in sof_set_get_large_ctrl_data Date: Tue, 3 Dec 2019 23:34:25 +0100 Message-Id: <20191203213010.441107861@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203213005.828543156@linuxfoundation.org> References: <20191203213005.828543156@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Navid Emamdoost [ Upstream commit 45c1380358b12bf2d1db20a5874e9544f56b34ab ] In the implementation of sof_set_get_large_ctrl_data() there is a memory leak in case an error. Release partdata if sof_get_ctrl_copy_params() fails. Fixes: 54d198d5019d ("ASoC: SOF: Propagate sof_get_ctrl_copy_params() error properly") Signed-off-by: Navid Emamdoost Link: https://lore.kernel.org/r/20191027215330.12729-1-navid.emamdoost@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sof/ipc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/ipc.c b/sound/soc/sof/ipc.c index 20dfca9c93b76..c4086186722f3 100644 --- a/sound/soc/sof/ipc.c +++ b/sound/soc/sof/ipc.c @@ -578,8 +578,10 @@ static int sof_set_get_large_ctrl_data(struct snd_sof_dev *sdev, else err = sof_get_ctrl_copy_params(cdata->type, partdata, cdata, sparams); - if (err < 0) + if (err < 0) { + kfree(partdata); return err; + } msg_bytes = sparams->msg_bytes; pl_size = sparams->pl_size; -- 2.20.1