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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 AC2EFC433ED for ; Fri, 30 Apr 2021 14:21:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 833DB61159 for ; Fri, 30 Apr 2021 14:21:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233626AbhD3OWk (ORCPT ); Fri, 30 Apr 2021 10:22:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:47697 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233014AbhD3OWN (ORCPT ); Fri, 30 Apr 2021 10:22:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619792484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=w/gN216hU1Rn3Btpd2kd7hL2tCgT/dn3Xe/SlBBd5lo=; b=eoOA7g5rveBq7BUcV8o+nlVHkhCZssgwJltvK4CXhx1XsYHRR3bknELuTIpZgGpBs+13iw hBTWFctenKz8ncTpLC6WbK5qYYcBvZjvEabAJWxvGz3LvOtjHqDWGYziGrgw9WbhdBjPF6 CErAWaMBiLtxWTqLQLNHMkWWnZYw6pM= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-362-6BwuBKSQOZyyb2CVL0S5aA-1; Fri, 30 Apr 2021 10:21:22 -0400 X-MC-Unique: 6BwuBKSQOZyyb2CVL0S5aA-1 Received: by mail-qk1-f198.google.com with SMTP id h15-20020a37de0f0000b029029a8ada2e18so30374847qkj.11 for ; Fri, 30 Apr 2021 07:21:22 -0700 (PDT) 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=w/gN216hU1Rn3Btpd2kd7hL2tCgT/dn3Xe/SlBBd5lo=; b=gg4U9pf5Z8RhuzsBDqY9vEEtsErPhMBLnwn/zksTlMzHrqfAUVnAsPRDQ5EeWiWhNm YB3Q7QIKPPEatYRr+Kj9U3m3G6FXRgSaYK2EyTaLUftwSXFuRLv/5U+UN7fydb9Tu2u7 upgyLQ/5pg7owb+JH4FEnELzUtV9uKdR7605btyn3eSXIQZGfTTcdqyfZoxRdhNb+0HX e+OvFV0L3MVIIpGOznDUROEgTGODDLrjtZA6sfaxM4E4kH1P5+HHW+9RutV9hc6kNDVz iL0ndJPcrDiKWc8iO30NVtoLlNeweO392zyZwjciw5/QqhYN0jrKW4NvD6F+0V2JfGBx Pxxg== X-Gm-Message-State: AOAM532wLY+Ua+JTbyMwNuPfZrgjw2X18AN24GbcY9J7WMXNG+t2zJSW SRuGbyQtbQV5LbjfBDcljshdsdBIfhfr4wIPiaoZM580SK1CFG20FtWfqOzFq8vkfNOyruelm/z nnc0XulSu9IndU762d2Kw7uTC X-Received: by 2002:ac8:5ac6:: with SMTP id d6mr4946505qtd.18.1619792482420; Fri, 30 Apr 2021 07:21:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdZI/RkrGjDivkFxS4UsfSFFktmqzzu95SsUqZ3E9oGQ70pLr6U5HZ8qsqrD35IpwXr+REig== X-Received: by 2002:ac8:5ac6:: with SMTP id d6mr4946481qtd.18.1619792482162; Fri, 30 Apr 2021 07:21:22 -0700 (PDT) Received: from localhost.localdomain.com (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id 1sm1477180qka.52.2021.04.30.07.21.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Apr 2021 07:21:21 -0700 (PDT) From: trix@redhat.com To: srinivas.kandagatla@linaro.org, bgoswami@codeaurora.org, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Tom Rix Subject: [PATCH v2] ASoC: codecs: lpass-wsa-macro: handle unexpected input Date: Fri, 30 Apr 2021 07:21:17 -0700 Message-Id: <20210430142117.3272772-1-trix@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tom Rix Static analysis reports this problem lpass-wsa-macro.c:1732:6: warning: Array subscript is undefined if (wsa->ec_hq[ec_tx]) { ^~~~~~~~~~~~~~~~~ The happens because 'ec_tx' is never initialized and there is no default in switch statement that sets ec_tx. Add a default case that returns an error before the array is accessed. Signed-off-by: Tom Rix --- v2: - handle the input error, keep switch --- sound/soc/codecs/lpass-wsa-macro.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index 1a7fa5492f28..d3ac318fd6b6 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -1727,6 +1727,10 @@ static int wsa_macro_enable_echo(struct snd_soc_dapm_widget *w, val = val & CDC_WSA_RX_MIX_TX1_SEL_MASK; ec_tx = (val >> CDC_WSA_RX_MIX_TX1_SEL_SHFT) - 1; break; + default: + dev_err(component->dev, "%s: Invalid shift %u\n", + __func__, w->shift); + return -EINVAL; } if (wsa->ec_hq[ec_tx]) { -- 2.26.3 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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 0A99FC433ED for ; Fri, 30 Apr 2021 14:22:28 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ABD6C6128C for ; Fri, 30 Apr 2021 14:22:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ABD6C6128C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 89DFE1682; Fri, 30 Apr 2021 16:21:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 89DFE1682 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1619792544; bh=mLR6raiRuJRibKIsDfQ5GRyovDgGdY9JJn9c8sIn/1c=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=b5foZTYirHPuMjGWQbzkgKHrvasrQ64hrcUv1DalTXvUIbtmN4FvQ6H5zUNJ1sP0t oiTe8XG1wI+GbmRpvF6iKDn/dYZkBxhahkGztwezbc763nZgAVXezQB4nMcgUE8zTU zbCkM2ZyFIpqpvshbGbcj92xWnW+z9Jneygz+NzM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 2105FF80165; Fri, 30 Apr 2021 16:21:34 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9F496F8016C; Fri, 30 Apr 2021 16:21:32 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 27D66F8012B for ; Fri, 30 Apr 2021 16:21:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 27D66F8012B Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HGJ+0uBT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619792487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w/gN216hU1Rn3Btpd2kd7hL2tCgT/dn3Xe/SlBBd5lo=; b=HGJ+0uBTOAEN796pJLh1GUHDhhSvCyBCMek40URJ+3n5R209VH3t49WdbzLSqeX/x7Q+zc vB/1ETHGA7O6Wg2ASeukNtvFiVxGmFV5LkM2HdjEh9R+gzAyEf5D0J66Gzzoja5qbR3z7f UQnYTfPW5IqijmSO3IDGoqb3ZjKjBpA= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-205-sTmZ5xV8M6CSXsppQBCSXA-1; Fri, 30 Apr 2021 10:21:22 -0400 X-MC-Unique: sTmZ5xV8M6CSXsppQBCSXA-1 Received: by mail-qk1-f199.google.com with SMTP id p196-20020a37a6cd0000b02902e41c0c90bbso22962369qke.5 for ; Fri, 30 Apr 2021 07:21:22 -0700 (PDT) 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=w/gN216hU1Rn3Btpd2kd7hL2tCgT/dn3Xe/SlBBd5lo=; b=o1PIjc1vh4KOCeDS7lU2uwSC1tY005MUOZ8KUCdrjpxbbmqJYKXcR66vkL31FL1+Da wy8/127AcDZEIoSccMuAbm+uRiTAnqNqy7B5Yr1MB0wBKYdnZ989MkeuBS6M60QEVg7P QnXCqdH7J/1NXImaaiMqMj5qw/LljtMkZOsGrR7YuULecKX0bZ1mFO+YxIXfJ4ZaCGfu 7UDY61zGasEqHV7pCkzcGTo3jfbNSfnUN+DRhaWYt1D/goTGY3XwkLFIHYCRsoNmQfJW 4UKrKOm+OSjYsH3XmGIWIVMzqJfPVxqQrqImIEXkmkuqvMRxlcbLAj/FxoVlESQtsFmY 6eqA== X-Gm-Message-State: AOAM531QS04pmm+c5zNqBpwogEYZe4eArrgT6xCirGFZ2F5hAG1Bfekv jIULnO13ssIwaNS4s5CyMhZj8yMdZPSjv0Zi0rRs3zdNH7mhLx7fU99+nkOXbd2Lgd8Mgy2Knhf Bv1W4wzsXqi4sWUpw7dvK66U= X-Received: by 2002:ac8:5ac6:: with SMTP id d6mr4946522qtd.18.1619792482549; Fri, 30 Apr 2021 07:21:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdZI/RkrGjDivkFxS4UsfSFFktmqzzu95SsUqZ3E9oGQ70pLr6U5HZ8qsqrD35IpwXr+REig== X-Received: by 2002:ac8:5ac6:: with SMTP id d6mr4946481qtd.18.1619792482162; Fri, 30 Apr 2021 07:21:22 -0700 (PDT) Received: from localhost.localdomain.com (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id 1sm1477180qka.52.2021.04.30.07.21.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Apr 2021 07:21:21 -0700 (PDT) From: trix@redhat.com To: srinivas.kandagatla@linaro.org, bgoswami@codeaurora.org, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com Subject: [PATCH v2] ASoC: codecs: lpass-wsa-macro: handle unexpected input Date: Fri, 30 Apr 2021 07:21:17 -0700 Message-Id: <20210430142117.3272772-1-trix@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=trix@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Cc: Tom Rix , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Tom Rix Static analysis reports this problem lpass-wsa-macro.c:1732:6: warning: Array subscript is undefined if (wsa->ec_hq[ec_tx]) { ^~~~~~~~~~~~~~~~~ The happens because 'ec_tx' is never initialized and there is no default in switch statement that sets ec_tx. Add a default case that returns an error before the array is accessed. Signed-off-by: Tom Rix --- v2: - handle the input error, keep switch --- sound/soc/codecs/lpass-wsa-macro.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index 1a7fa5492f28..d3ac318fd6b6 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -1727,6 +1727,10 @@ static int wsa_macro_enable_echo(struct snd_soc_dapm_widget *w, val = val & CDC_WSA_RX_MIX_TX1_SEL_MASK; ec_tx = (val >> CDC_WSA_RX_MIX_TX1_SEL_SHFT) - 1; break; + default: + dev_err(component->dev, "%s: Invalid shift %u\n", + __func__, w->shift); + return -EINVAL; } if (wsa->ec_hq[ec_tx]) { -- 2.26.3