Commit 1cf11d80 authored by Denis Arefev's avatar Denis Arefev Committed by Takashi Iwai
Browse files

ALSA: hda: Fix missing pointer check in hda_component_manager_init function 



The __component_match_add function may assign the 'matchptr' pointer
the value ERR_PTR(-ENOMEM), which will subsequently be dereferenced.

The call stack leading to the error looks like this:

hda_component_manager_init
|-> component_match_add
    |-> component_match_add_release
        |-> __component_match_add ( ... ,**matchptr, ... )
            |-> *matchptr = ERR_PTR(-ENOMEM);       // assign
|-> component_master_add_with_match( ...  match)
    |-> component_match_realloc(match, match->num); // dereference

Add IS_ERR() check to prevent the crash.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: ae7abe36 ("ALSA: hda/realtek: Add CS35L41 support for Thinkpad laptops")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDenis Arefev <arefev@swemel.ru>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8527bbb3

sound/hda/codecs/side-codecs/hda_component.c

+4 −0
Original line number Diff line number Diff line
@@ -174,6 +174,10 @@ int hda_component_manager_init(struct hda_codec *cdc, 
		sm->match_str = match_str;

		sm->index = i;

		component_match_add(dev, &match, hda_comp_match_dev_name, sm);

		if (IS_ERR(match)) {

			codec_err(cdc, "Fail to add component %ld\n", PTR_ERR(match));

			return PTR_ERR(match);

		}

	}



	ret = component_master_add_with_match(dev, ops, match);