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=-12.8 required=3.0 tests=BAYES_00,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 0F72BC433E1 for ; Mon, 17 Aug 2020 18:17:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C87AC20738 for ; Mon, 17 Aug 2020 18:17:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597688262; bh=9cWvJtpb0yUXyiUKt+lWycMgFqe/Z1V/1bKWEND9nUk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0174guiuE963SEYGp0LwP1SKCAnrV1L9uJEgmDXb3e03PEnK3JnokFVHvJ83Ea9fv y8MhRAiQopgA3FAIyf/617og9wQCq3HJaz23/cAfj/deuyBKBe4nW7CUVK9onViwT3 tUkSd57H/7aYaDTd0fPaeVONZbX1bDNPFUVMu4vE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390762AbgHQSRk (ORCPT ); Mon, 17 Aug 2020 14:17:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:53238 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388376AbgHQQFo (ORCPT ); Mon, 17 Aug 2020 12:05:44 -0400 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 A79A820748; Mon, 17 Aug 2020 16:05:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597680339; bh=9cWvJtpb0yUXyiUKt+lWycMgFqe/Z1V/1bKWEND9nUk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tbwPhf9a/cu3SYN/rRU5x2x4Wle+2PKUsN4ro80I7xFjj8yggy5cTcBYjAA/AXlSp gSucn0EKdRbfYewEbm6cDzxKHKBkymzIZHe5XMZVLlLTWjP0W0wnrkQ9MRhNTTO0od ioDbMoRQcaNSu1ogi8WaKSo55B8u35A41GToNt4c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jing Xiangfeng , Jerome Brunet , Mark Brown , Sasha Levin Subject: [PATCH 5.4 147/270] ASoC: meson: fixes the missed kfree() for axg_card_add_tdm_loopback Date: Mon, 17 Aug 2020 17:15:48 +0200 Message-Id: <20200817143803.132321114@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143755.807583758@linuxfoundation.org> References: <20200817143755.807583758@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: Jing Xiangfeng [ Upstream commit bd054ece7d9cdd88e900df6625e951a01d9f655e ] axg_card_add_tdm_loopback() misses to call kfree() in an error path. We can use devm_kasprintf() to fix the issue, also improve maintainability. So use it instead. Fixes: c84836d7f650 ("ASoC: meson: axg-card: use modern dai_link style") Signed-off-by: Jing Xiangfeng Reviewed-by: Jerome Brunet Link: https://lore.kernel.org/r/20200717082242.130627-1-jingxiangfeng@huawei.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/meson/axg-card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index 1f698adde506c..7126344017fa6 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -266,7 +266,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card, lb = &card->dai_link[*index + 1]; - lb->name = kasprintf(GFP_KERNEL, "%s-lb", pad->name); + lb->name = devm_kasprintf(card->dev, GFP_KERNEL, "%s-lb", pad->name); if (!lb->name) return -ENOMEM; -- 2.25.1