From nobody Sat May 10 02:27:07 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607063866; cv=none; d=zohomail.com; s=zohoarc; b=UPSvJcxy18CA4dFTrwd6I8XRh0kcz2A1vX4Esw5BU4Z47JiBcpHMiP1VQEVEeC/7I7kTSSv29Z1WVLXDEe1TdZ9Sb4ojarWNlF6yZZjrT+EfqVOvgqeR07hr/v+FhRgQZs20LBx2RurVsXrhvWdR6n0yVvA45OZTmWj2OtCVxN0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607063866; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:MIME-Version:Message-ID:Subject:To; bh=d8zcL1eX6CvAPfDYqfT78b23zOBds1VQznv7wReCOyU=; b=WqKG/DISo1bmflVfZArLZF8HwtOoHXT7eKtnmVr1U/YMcOtotH9ZOgWPb6/eivBgVyDzQQ2FgVM6tOlmG7zSzonkexUXjzo00P90HmCxSPucDQv9FyOzvW5kl2xF5AsdS/4+K3KtG+C84mOa13fGqzrYBvkqjTC3CLt5sgUBdKs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1607063866425909.902916259034; Thu, 3 Dec 2020 22:37:46 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727894AbgLDGhK (ORCPT ); Fri, 4 Dec 2020 01:37:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725372AbgLDGhK (ORCPT ); Fri, 4 Dec 2020 01:37:10 -0500 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC194C061A4F for ; Thu, 3 Dec 2020 22:36:29 -0800 (PST) Received: by mail-pj1-x1042.google.com with SMTP id r9so2499470pjl.5 for ; Thu, 03 Dec 2020 22:36:29 -0800 (PST) Received: from suzukaze.ipads-lab.se.sjtu.edu.cn ([202.120.40.82]) by smtp.gmail.com with ESMTPSA id s7sm1061799pju.37.2020.12.03.22.36.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Dec 2020 22:36:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=d8zcL1eX6CvAPfDYqfT78b23zOBds1VQznv7wReCOyU=; b=GEVjSLhLfO+7YBd6hC05bIWrNYzx9F2pnutdRFYJ1+IKuwS7ZoUn+AVv3CfetyArsD BImgo9Bb20guGnnzUemlfcMdGuP3VedWB9JRgoVlZvF4Vzn1rg7TU6GG20nfreOHkT7o 4WBwN2u5Gzdc8w+2F+KpN7yaPqgJzPQUFSKsg6p6uJeDLuB2b2qJzRYqf0spO33BNW23 XCMXW68hf9FGj+nW0Wjrj6CtRsaYFkTm2bUqKJxvBQteC0Z3icJJmwEe4jL+5bpTbIC/ 5WJdbB74CAYI6JJYCOKUSVbhZW29sRSqHV+RRwMC95v8DiliBfqzLXJyVdKSGVKGrBZC zQYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=d8zcL1eX6CvAPfDYqfT78b23zOBds1VQznv7wReCOyU=; b=M0CbO+C6Nro0J2qN6UCGxOxgKdPKWCsaFqtyawLhdeB8CP0+Fcuk59JsCAQSGQngNe avwbor4pZUqy3EsdknZ7JSRcQJmD/eeJLUPIa6rTPSIGxCXeKJpz6BvgFyeNG377+XRi NTHm/xfxtxCLaoDgdiRHDGPULBK1QrljV4ZK4oevH+tpQA9TeouKcoMABZCOzlcpzKlm +W2eD1nz+qg4ifhjgzuhZLdI4tRSkiNYo0vY77NvvWsIrXNQV5dLzQZJNkCA7yqdS1Mr TjJ+rK9Dg2SrO5ycLmWbaqWrGKz4U7mk+gs2jH9IlQ5FoXK4RS8MpoQqLvQ0rGY1pjmC UPbg== X-Gm-Message-State: AOAM533lIcBC4nthsAFvu5lpbUxjAwh0Rka7qfpi75G9PFgsGf2uGBiT Y+pH5t+YL5EZErSbNn++S/A= X-Google-Smtp-Source: ABdhPJx6UqI+qe96zyrcJ0fjsLM79ORJhXCDk3xmBRveOXZPHpMfdOZ91FML3RrmePr0Fd+UGUrG6g== X-Received: by 2002:a17:90a:550d:: with SMTP id b13mr2697496pji.133.1607063789062; Thu, 03 Dec 2020 22:36:29 -0800 (PST) From: Chuhong Yuan Cc: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Kuninori Morimoto , Pierre-Louis Bossart , Agrawal Akshu , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Chuhong Yuan Subject: [PATCH v2] ASoC: amd: change clk_get() to devm_clk_get() and add missed checks Date: Fri, 4 Dec 2020 14:36:10 +0800 Message-Id: <20201204063610.513556-1-hslester96@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" cz_da7219_init() does not check the return values of clk_get(), while da7219_clk_enable() calls clk_set_rate() to dereference the pointers. Add checks to fix the problems. Also, change clk_get() to devm_clk_get() to avoid data leak after failures. Fixes: bb24a31ed584 ("ASoC: AMD: Configure wclk and bclk of master codec") Signed-off-by: Chuhong Yuan --- Changes in v2: - Replace clk_get() with devm_clk_get() to prevent data leak. sound/soc/amd/acp-da7219-max98357a.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da721= 9-max98357a.c index a7702e64ec51..849288d01c6b 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -73,8 +73,13 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rt= d) return ret; } =20 - da7219_dai_wclk =3D clk_get(component->dev, "da7219-dai-wclk"); - da7219_dai_bclk =3D clk_get(component->dev, "da7219-dai-bclk"); + da7219_dai_wclk =3D devm_clk_get(component->dev, "da7219-dai-wclk"); + if (IS_ERR(da7219_dai_wclk)) + return PTR_ERR(da7219_dai_wclk); + + da7219_dai_bclk =3D devm_clk_get(component->dev, "da7219-dai-bclk"); + if (IS_ERR(da7219_dai_bclk)) + return PTR_ERR(da7219_dai_bclk); =20 ret =3D snd_soc_card_jack_new(card, "Headset Jack", SND_JACK_HEADSET | SND_JACK_LINEOUT | --=20 2.26.2