From patchwork Fri Nov 2 15:18:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 150048 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2204313ljp; Fri, 2 Nov 2018 08:19:47 -0700 (PDT) X-Google-Smtp-Source: AJdET5eMYadSxFxsvH71ThI1QOD/NDapmBwh2wk7KGctMEaqzr1DOIB9Z8gTFhHN+XJaKD/NZcgu X-Received: by 2002:adf:81a3:: with SMTP id 32-v6mr9800155wra.10.1541171987720; Fri, 02 Nov 2018 08:19:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541171987; cv=none; d=google.com; s=arc-20160816; b=Df8YMXP2xCgMVNflWI72IlfK1/4rQFIkDwJR7KQoSaDPRSNWH7WJomcAS2OaHuyvic gcxr40SvQ1ESe09AgUboaS9Nj13cNUDPRLP7UjfUoQxKkMg3H8HJNqtND10NJaFtc4MH E0X3nXMw1Gs/1WhN1y/cc1z3oLmzI/cqiKikrXK5ezFlYlYpqaBVSfmt/fKC1+/x/0uA 2HvGkqbKqa5+p65UeI+6oSLJYSXjnt3VRdONTlNnEVKsIvAcvPiqljGlgWJ/He0iXeKd I4ESY8lUXIRMl18Ut+ECPUSn4NVou4LuneCUXnfl0Dvs0qXLMeBXBOJvuHLwSuXf08js 4K4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from:delivered-to; bh=96sjUrTBLq0z6ZPtbmCBKp9nqndKhyEgbsWXfiDYoBg=; b=AvThrjTWDbJVYhOQi2gl1bIe5Y5ZEwOVanngl8TMVDe9d3PZnwr1xa5JFX/huw/bGq DEC3UXX+MROOiuC5iw5Zgz9L68OL4nEycqiNfdRuHoij88rfi+V6NfMApR009uAygdMJ yoQWX135pHDQhtc3ANnpvr0KkT1f54zzwtrhEAjZI4TxXs5smcMQzT5LzR0HbjtRluUz ns97A6JAhk7VuC2zGhSdYybtdazqYbI89vVtcXEXrFFZv6N59FXY5M1e3mbxS9q7sCRv yIRbs072YHHSg3p25PnBQlFdHRVzffHu0mVXh3X62WIMgwMcwiDLuYB998N9R5BeoSUr OwEQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id e2-v6si7577744wrd.147.2018.11.02.08.19.47; Fri, 02 Nov 2018 08:19:47 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id E1297267971; Fri, 2 Nov 2018 16:19:45 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id EA35D26798A; Fri, 2 Nov 2018 16:19:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2 autolearn=disabled version=3.4.0 Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.131]) by alsa0.perex.cz (Postfix) with ESMTP id E918926796C for ; Fri, 2 Nov 2018 16:19:37 +0100 (CET) Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.129]) with ESMTPA (Nemesis) id 1M1HmE-1gGwGl1Jus-002mbo; Fri, 02 Nov 2018 16:19:25 +0100 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.129]) with ESMTPA (Nemesis) id 1M1HmE-1gGwGl1Jus-002mbo; Fri, 02 Nov 2018 16:19:25 +0100 From: Arnd Bergmann To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Date: Fri, 2 Nov 2018 16:18:21 +0100 Message-Id: <20181102151922.889131-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:oIhgZpapvZj1izMFj4I9NkMbYVIe2+oZf6Xb8V9bLSg+Jmafy59 g9BQfSxhATwfH/ZULHnBecYTAXsjRwd8a4ZS8C0z1+5FofZ4id4b1r8iUY0lJlEJFqriDhz QsnGh0ZalJhqdSvtj/YvBk/0q0R7+iyukvWLMGkuEH8gb5TF5TFJq7tbK08FkFb9qANrv6i 2WcZA6HKziUbH78pI2rDg== X-UI-Out-Filterresults: notjunk:1; V01:K0:/F++M8gpaWQ=:h3dTp5GK1AawCCIwOF/085 ZyfDvbz1h4146XD8lnBQYTk1Wa3TzMVD5tSaiEmQKR6V9EJRsVGdvJnyvnunD6ZwgErdO0ApX whcVqK/VgfX4+IF2fLN8wHKcL/9nSkUu0D50mNQrdCcXo0wyUKf/fFTqav0pVc6RI/bUrK2L5 LuEnDlax/aaSRV1hqIa+a0DPAguDXLjrw394fsEI/ZdFaVdteSUjiP24Cy9x2HD3twbboLW7v YNhHSQI6MCgIBLXKI6KGy2nHn/iZA19sdtXqu1KVb7QPDaVwakS9ILUz1MtBETwnnEuFSgJeq zxsY1f4tikcGrWKrzniO+0lboNY2pFQYLMaYNuqUNeM0rigJo0dTmgjIuqlP+plsJazwDTdZz 9eS0vYtt1LP92OH6bbda0QGqX/8nV5vYXCO3mj3lHJOv5PyQWnKGUfyD7QuWb2DqOKRWTMFsK nQkrwqHxS+oT0PcNye/EAMWgz+yvDwXuKwiApDQO20+4Gt7LBevkj3sj7zLavBtYrPuZKLWcb clr15UvD+PlhiLw9ry0qL0Cya/rIndOKd/STFqUWQCBWHqq+dUr9ZXTLLsD042h8FaCoHPPuR tlQ3cuPoyH9oBJ4nh5++XzsDx9qRX/PnPzHRx9xXjC9upF6QWT84Tatg9xbkiqEmrXSxEVKmB CEdrsperYmuOiIgCnEFe7bktyAzzLUB8NhSIBpTELMxynmCunTz5IpXQIn8CWPXXzn6U= Cc: alsa-devel@alsa-project.org, Charles Keepax , Arnd Bergmann , Kuninori Morimoto , Marcel Ziswiler , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, Fabio Estevam , Robert Jarzmik Subject: [alsa-devel] [PATCH] [v2] ASoC: wm97xx: fix uninitialized regmap pointer problem X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org gcc notices that without either the ac97 bus or the pdata, we never initialize the regmap pointer, which leads to an uninitialized variable access: sound/soc/codecs/wm9712.c: In function 'wm9712_soc_probe': sound/soc/codecs/wm9712.c:666:2: error: 'regmap' may be used uninitialized in this function [-Werror=maybe-uninitialized] Since that configuration is invalid, it's better to return an error here. I tried to avoid adding complexity to the conditions, and turned the #ifdef into a regular if(IS_ENABLED()) check for readability. This in turn requires moving some header file declarations out of an #ifdef. The same code is used in three drivers, all of which I'm changing the same way. Fixes: 2ed1a8e0ce8d ("ASoC: wm9712: add ac97 new bus support") Signed-off-by: Arnd Bergmann --- v2: fix a missing check that Charles pointed out --- include/sound/soc.h | 2 +- sound/soc/codecs/wm9705.c | 10 ++++------ sound/soc/codecs/wm9712.c | 10 ++++------ sound/soc/codecs/wm9713.c | 10 ++++------ 4 files changed, 13 insertions(+), 19 deletions(-) -- 2.18.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel Acked-by: Charles Keepax diff --git a/include/sound/soc.h b/include/sound/soc.h index 70c10a8f3e90..3e0ac310a3df 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -553,12 +553,12 @@ static inline void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count, } #endif -#ifdef CONFIG_SND_SOC_AC97_BUS struct snd_ac97 *snd_soc_alloc_ac97_component(struct snd_soc_component *component); struct snd_ac97 *snd_soc_new_ac97_component(struct snd_soc_component *component, unsigned int id, unsigned int id_mask); void snd_soc_free_ac97_component(struct snd_ac97 *ac97); +#ifdef CONFIG_SND_SOC_AC97_BUS int snd_soc_set_ac97_ops(struct snd_ac97_bus_ops *ops); int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops, struct platform_device *pdev); diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index ccdf088461b7..54c306707c02 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c @@ -325,8 +325,7 @@ static int wm9705_soc_probe(struct snd_soc_component *component) if (wm9705->mfd_pdata) { wm9705->ac97 = wm9705->mfd_pdata->ac97; regmap = wm9705->mfd_pdata->regmap; - } else { -#ifdef CONFIG_SND_SOC_AC97_BUS + } else if (IS_ENABLED(CONFIG_SND_SOC_AC97_BUS)) { wm9705->ac97 = snd_soc_new_ac97_component(component, WM9705_VENDOR_ID, WM9705_VENDOR_ID_MASK); if (IS_ERR(wm9705->ac97)) { @@ -339,7 +338,8 @@ static int wm9705_soc_probe(struct snd_soc_component *component) snd_soc_free_ac97_component(wm9705->ac97); return PTR_ERR(regmap); } -#endif + } else { + return -ENXIO; } snd_soc_component_set_drvdata(component, wm9705->ac97); @@ -350,14 +350,12 @@ static int wm9705_soc_probe(struct snd_soc_component *component) static void wm9705_soc_remove(struct snd_soc_component *component) { -#ifdef CONFIG_SND_SOC_AC97_BUS struct wm9705_priv *wm9705 = snd_soc_component_get_drvdata(component); - if (!wm9705->mfd_pdata) { + if (IS_ENABLED(CONFIG_SND_SOC_AC97_BUS) && !wm9705->mfd_pdata) { snd_soc_component_exit_regmap(component); snd_soc_free_ac97_component(wm9705->ac97); } -#endif } static const struct snd_soc_component_driver soc_component_dev_wm9705 = { diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index e873baa9e778..01949eaba4fd 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -642,8 +642,7 @@ static int wm9712_soc_probe(struct snd_soc_component *component) if (wm9712->mfd_pdata) { wm9712->ac97 = wm9712->mfd_pdata->ac97; regmap = wm9712->mfd_pdata->regmap; - } else { -#ifdef CONFIG_SND_SOC_AC97_BUS + } else if (IS_ENABLED(CONFIG_SND_SOC_AC97_BUS)) { int ret; wm9712->ac97 = snd_soc_new_ac97_component(component, WM9712_VENDOR_ID, @@ -660,7 +659,8 @@ static int wm9712_soc_probe(struct snd_soc_component *component) snd_soc_free_ac97_component(wm9712->ac97); return PTR_ERR(regmap); } -#endif + } else { + return -ENXIO; } snd_soc_component_init_regmap(component, regmap); @@ -673,14 +673,12 @@ static int wm9712_soc_probe(struct snd_soc_component *component) static void wm9712_soc_remove(struct snd_soc_component *component) { -#ifdef CONFIG_SND_SOC_AC97_BUS struct wm9712_priv *wm9712 = snd_soc_component_get_drvdata(component); - if (!wm9712->mfd_pdata) { + if (IS_ENABLED(CONFIG_SND_SOC_AC97_BUS) && !wm9712->mfd_pdata) { snd_soc_component_exit_regmap(component); snd_soc_free_ac97_component(wm9712->ac97); } -#endif } static const struct snd_soc_component_driver soc_component_dev_wm9712 = { diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 643863bb32e0..5a2fdf4f69bf 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -1214,8 +1214,7 @@ static int wm9713_soc_probe(struct snd_soc_component *component) if (wm9713->mfd_pdata) { wm9713->ac97 = wm9713->mfd_pdata->ac97; regmap = wm9713->mfd_pdata->regmap; - } else { -#ifdef CONFIG_SND_SOC_AC97_BUS + } else if (IS_ENABLED(CONFIG_SND_SOC_AC97_BUS)) { wm9713->ac97 = snd_soc_new_ac97_component(component, WM9713_VENDOR_ID, WM9713_VENDOR_ID_MASK); if (IS_ERR(wm9713->ac97)) @@ -1225,7 +1224,8 @@ static int wm9713_soc_probe(struct snd_soc_component *component) snd_soc_free_ac97_component(wm9713->ac97); return PTR_ERR(regmap); } -#endif + } else { + return -ENXIO; } snd_soc_component_init_regmap(component, regmap); @@ -1238,14 +1238,12 @@ static int wm9713_soc_probe(struct snd_soc_component *component) static void wm9713_soc_remove(struct snd_soc_component *component) { -#ifdef CONFIG_SND_SOC_AC97_BUS struct wm9713_priv *wm9713 = snd_soc_component_get_drvdata(component); - if (!wm9713->mfd_pdata) { + if (IS_ENABLED(CONFIG_SND_SOC_AC97_BUS) && !wm9713->mfd_pdata) { snd_soc_component_exit_regmap(component); snd_soc_free_ac97_component(wm9713->ac97); } -#endif } static const struct snd_soc_component_driver soc_component_dev_wm9713 = {