ASoC: hdac_hdmi: Dereference 'edev' after checking for NULL
diff mbox

Message ID 1455700199-18691-1-git-send-email-festevam@gmail.com
State New
Headers show

Commit Message

Fabio Estevam Feb. 17, 2016, 9:09 a.m. UTC
From: Fabio Estevam <fabio.estevam@nxp.com>

Commit 4a3478debf36 ("ASoC: hdac_hdmi: Add jack reporting") 
leads to the following Smatch complaint:

sound/soc/codecs/hdac_hdmi.c:971 hdac_hdmi_present_sense()
         warn: variable dereferenced before check 'edev' (see line 967)

,so deference 'edev' after checking for NULL.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
 sound/soc/codecs/hdac_hdmi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Subhransu S. Prusty Feb. 17, 2016, 9:21 a.m. UTC | #1
On Wed, Feb 17, 2016 at 07:09:59AM -0200, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
> 
> Commit 4a3478debf36 ("ASoC: hdac_hdmi: Add jack reporting") 
> leads to the following Smatch complaint:
> 
> sound/soc/codecs/hdac_hdmi.c:971 hdac_hdmi_present_sense()
>          warn: variable dereferenced before check 'edev' (see line 967)
> 
> ,so deference 'edev' after checking for NULL.

This NULL check is not required, can be removed.

edev object is expected to be present when the present_sense is called. This
is called from places where this edev object is already available. 

Regards,
Subhransu

> 
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
> ---
>  sound/soc/codecs/hdac_hdmi.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
> index 36f1200..920af2f 100644
> --- a/sound/soc/codecs/hdac_hdmi.c
> +++ b/sound/soc/codecs/hdac_hdmi.c
> @@ -964,13 +964,15 @@ static int hdac_hdmi_add_cvt(struct hdac_ext_device *edev, hda_nid_t nid)
>  static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, int repoll)
>  {
>  	struct hdac_ext_device *edev = pin->edev;
> -	struct hdac_hdmi_priv *hdmi = edev->private_data;
> +	struct hdac_hdmi_priv *hdmi;
>  	struct hdac_hdmi_pcm *pcm;
>  	int val;
>  
>  	if (!edev)
>  		return;
>  
> +	hdmi = edev->private_data;
> +
>  	pin->repoll_count = repoll;
>  
>  	pm_runtime_get_sync(&edev->hdac.dev);
> -- 
> 1.9.1
>
Mark Brown Feb. 17, 2016, 7:20 p.m. UTC | #2
On Wed, Feb 17, 2016 at 07:09:59AM -0200, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
> 
> Commit 4a3478debf36 ("ASoC: hdac_hdmi: Add jack reporting") 
> leads to the following Smatch complaint:

This doesn't apply against current code, please check and resend.
Fabio Estevam Feb. 17, 2016, 7:52 p.m. UTC | #3
Hi Mark,

On Wed, Feb 17, 2016 at 5:20 PM, Mark Brown <broonie@kernel.org> wrote:
> On Wed, Feb 17, 2016 at 07:09:59AM -0200, Fabio Estevam wrote:
>> From: Fabio Estevam <fabio.estevam@nxp.com>
>>
>> Commit 4a3478debf36 ("ASoC: hdac_hdmi: Add jack reporting")
>> leads to the following Smatch complaint:
>
> This doesn't apply against current code, please check and resend.

It seems you have already applied it;
https://git.kernel.org/cgit/linux/kernel/git/broonie/sound.git/commit/?h=for-next&id=cd890ade492784ae06dadd20e688ba1760d3c801

Patch
diff mbox

diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c
index 36f1200..920af2f 100644
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
@@ -964,13 +964,15 @@  static int hdac_hdmi_add_cvt(struct hdac_ext_device *edev, hda_nid_t nid)
 static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, int repoll)
 {
 	struct hdac_ext_device *edev = pin->edev;
-	struct hdac_hdmi_priv *hdmi = edev->private_data;
+	struct hdac_hdmi_priv *hdmi;
 	struct hdac_hdmi_pcm *pcm;
 	int val;
 
 	if (!edev)
 		return;
 
+	hdmi = edev->private_data;
+
 	pin->repoll_count = repoll;
 
 	pm_runtime_get_sync(&edev->hdac.dev);