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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35DB9C77B73 for ; Wed, 19 Apr 2023 19:03:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231348AbjDSTDw (ORCPT ); Wed, 19 Apr 2023 15:03:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229514AbjDSTDt (ORCPT ); Wed, 19 Apr 2023 15:03:49 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C1442120; Wed, 19 Apr 2023 12:03:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681931026; x=1713467026; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=1Hh8WUIR6eeK+AxsczOGGcqyUNQHx9FNhheYlsKci2Y=; b=Da/AF8m2fHuY++heJ9dpgsxTj33jirSNiKuchiw9Bw4flgLt3reOAfIK 8rp5ONU3pnB5PZ6Y3lQI3D3RIgpwF08UMnkSxIBQLuwWduM/5u85Bwc13 uurHU0QVvp3F4CJg/jG8nzYSJ5w//jkenvjjbnEme8dQvbjBJxqbvvDpD XjbdCCLLZREO0XABbtTSH59PviPp4bJZSymZANrZaNn7YhBgqYord+DZE h0nL6vWOFssX9/3wYUAdPWYCZymYWQ57ZdMAX9xHoKFLdQMcJcNlsB6b8 SCuN4MIXg83FESU4U6UPuaKJmr/ukr3icLveG5YcZeTssSDog/yjIcCdM Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10685"; a="325148265" X-IronPort-AV: E=Sophos;i="5.99,210,1677571200"; d="scan'208";a="325148265" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Apr 2023 12:03:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10685"; a="1021319731" X-IronPort-AV: E=Sophos;i="5.99,210,1677571200"; d="scan'208";a="1021319731" Received: from gargicha-mobl1.amr.corp.intel.com (HELO [10.209.74.38]) ([10.209.74.38]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Apr 2023 12:03:19 -0700 Message-ID: Date: Wed, 19 Apr 2023 14:03:18 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0 Thunderbird/102.10.0 Subject: Re: [PATCH] ASoC: SOF: Intel: hda-stream: Move three variable assignments behind condition checks in hda_dsp_iccmax_stream_hw_params() Content-Language: en-US To: Markus Elfring , kernel-janitors@vger.kernel.org, alsa-devel@alsa-project.org, sound-open-firmware@alsa-project.org, Bard Liao , Daniel Baluta , Jaroslav Kysela , Kai Vehmanen , Liam Girdwood , Mark Brown , Peter Ujfalusi , Rander Wang , Ranjani Sridharan , Takashi Iwai Cc: cocci@inria.fr, LKML References: <40c60719-4bfe-b1a4-ead7-724b84637f55@web.de> <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> From: Pierre-Louis Bossart In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 4/19/23 13:54, Markus Elfring wrote: > Date: Wed, 19 Apr 2023 20:42:19 +0200 > > The address of a data structure member was determined before > a corresponding null pointer check in the implementation of > the function “hda_dsp_iccmax_stream_hw_params”. > > Thus avoid the risk for undefined behaviour by moving the assignment > for three local variables behind some condition checks. > > This issue was detected by using the Coccinelle software. > > Fixes: 7d88b9608142f95ccdd3dfb190da4a5faddb1cc7 ("ASoC: SOF: Intel: hdac_ext_stream: consistent prefixes for variables/members") > Signed-off-by: Markus Elfring Yes indeed, for some reason this was fixed in hda_dsp_stream_hw_params() but not in the hda_dsp_iccmax_stream_hw_params() variant. Could we however use the same code as in hda_dsp_stream_hw_params() for consistency? if (!hext_stream) { dev_err(sdev->dev, "error: no stream available\n"); return -ENODEV; } if (!dmab) { dev_err(sdev->dev, "error: no dma buffer allocated!\n"); return -ENODEV; } hstream = &hext_stream->hstream; sd_offset = SOF_STREAM_SD_OFFSET(hstream); mask = BIT(hstream->index); Thanks! > --- > sound/soc/sof/intel/hda-stream.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/sof/intel/hda-stream.c b/sound/soc/sof/intel/hda-stream.c > index 79d818e6a0fa..9c44127014fc 100644 > --- a/sound/soc/sof/intel/hda-stream.c > +++ b/sound/soc/sof/intel/hda-stream.c > @@ -407,10 +407,10 @@ int hda_dsp_iccmax_stream_hw_params(struct snd_sof_dev *sdev, struct hdac_ext_st > struct snd_dma_buffer *dmab, > struct snd_pcm_hw_params *params) > { > - struct hdac_stream *hstream = &hext_stream->hstream; > - int sd_offset = SOF_STREAM_SD_OFFSET(hstream); > + struct hdac_stream *hstream; > + int sd_offset; > int ret; > - u32 mask = 0x1 << hstream->index; > + u32 mask; > > if (!hext_stream) { > dev_err(sdev->dev, "error: no stream available\n"); > @@ -422,9 +422,12 @@ int hda_dsp_iccmax_stream_hw_params(struct snd_sof_dev *sdev, struct hdac_ext_st > return -ENODEV; > } > > + hstream = &hext_stream->hstream; > if (hstream->posbuf) > *hstream->posbuf = 0; > > + sd_offset = SOF_STREAM_SD_OFFSET(hstream); > + > /* reset BDL address */ > snd_sof_dsp_write(sdev, HDA_DSP_HDA_BAR, > sd_offset + SOF_HDA_ADSP_REG_SD_BDLPL, > @@ -459,6 +462,8 @@ int hda_dsp_iccmax_stream_hw_params(struct snd_sof_dev *sdev, struct hdac_ext_st > sd_offset + SOF_HDA_ADSP_REG_SD_LVI, > 0xffff, (hstream->frags - 1)); > > + mask = 0x1 << hstream->index; > + > /* decouple host and link DMA, enable DSP features */ > snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL, > mask, mask); > -- > 2.40.0 >