From: Vinod Koul <vinod.koul@intel.com>
To: alsa-devel@alsa-project.org
Cc: liam.r.girdwood@linux.intel.com, patches.audio@intel.com,
broonie@kernel.org, Vinod Koul <vinod.koul@intel.com>,
Jeeja KP <jeeja.kp@intel.com>
Subject: [PATCH 3/3] ASoC: Intel: Skylake: Fix substream dereference before check
Date: Fri, 30 Oct 2015 20:34:20 +0530 [thread overview]
Message-ID: <1446217461-2106-4-git-send-email-vinod.koul@intel.com> (raw)
In-Reply-To: <1446217461-2106-1-git-send-email-vinod.koul@intel.com>
Smatch warns that we dereferenced substream before check, so fix
this by initializing ebus after the check
sound/soc/intel/skylake/skl-pcm.c:802 skl_get_position()
warn: variable dereferenced before check 'substream->runtime'
Reported by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
sound/soc/intel/skylake/skl-pcm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
index 2517ec576ffc..e652d58bd9a9 100644
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@ -807,7 +807,7 @@ static unsigned int skl_get_position(struct hdac_ext_stream *hstream,
{
struct hdac_stream *hstr = hdac_stream(hstream);
struct snd_pcm_substream *substream = hstr->substream;
- struct hdac_ext_bus *ebus = get_bus_ctx(substream);
+ struct hdac_ext_bus *ebus;
unsigned int pos;
int delay;
@@ -818,6 +818,7 @@ static unsigned int skl_get_position(struct hdac_ext_stream *hstream,
pos = 0;
if (substream->runtime) {
+ ebus = get_bus_ctx(substream);
delay = skl_get_delay_from_lpib(ebus, hstream, pos)
+ codec_delay;
substream->runtime->delay += delay;
--
1.9.1
next prev parent reply other threads:[~2015-10-30 15:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-30 15:04 [PATCH 0/3] ASoC: Intel: Skylake: Some more fixes Vinod Koul
2015-10-30 15:04 ` [PATCH 1/3] ASoC: Intel: Skylake: fix missing machine device creation Vinod Koul
2015-11-01 2:54 ` Mark Brown
2015-11-02 10:11 ` Vinod Koul
2015-11-02 12:07 ` Mark Brown
2015-11-02 15:32 ` Vinod Koul
2015-11-03 11:24 ` Mark Brown
2015-11-03 12:29 ` Keyon
2015-11-03 17:58 ` Vinod Koul
2015-11-03 17:57 ` Vinod Koul
2015-11-04 14:29 ` Mark Brown
2015-11-04 16:07 ` Vinod Koul
2015-10-30 15:04 ` [PATCH 2/3] ASoC: Intel: Skylake: Fix to cleanup if skl_sst_dsp_init fails Vinod Koul
2015-11-02 10:39 ` Applied "ASoC: Intel: Skylake: Fix to cleanup if skl_sst_dsp_init fails" to the asoc tree Mark Brown
2015-10-30 15:04 ` Vinod Koul [this message]
2015-11-02 10:39 ` Applied "ASoC: Intel: Skylake: Fix substream dereference before check" " Mark Brown
2015-10-30 15:04 ` [PATCH 0/3] ASoC: Intel: Skylake: Some more fixes Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1446217461-2106-4-git-send-email-vinod.koul@intel.com \
--to=vinod.koul@intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=jeeja.kp@intel.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=patches.audio@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox