Commit 90df4957 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Takashi Iwai
Browse files

ALSA: hda: cs35l56: Fix uninitialized value in cs35l56_hda_read_acpi() 



Eliminate the uninitialized 'nval' in cs35l56_hda_read_acpi() if a
system-specific quirk overrides processing of the dev-index property.
The value is now stored in a new 'num_amps' member of struct cs35l56_hda
so that the quirk handler can set the value.

The quirk for the Lenovo Yoga Book 9i GenX  replaces the values from the
dev-index property with hardcoded indexes. So cs35l56_hda_read_acpi() would
then skip reading the property. But this left the 'nval' local variable
uninitialized when it is later passed to cirrus_scodec_get_speaker_id().

Fixes: 40b1c2f9 ("ALSA: hda/cs35l56: Workaround bad dev-index on Lenovo Yoga Book 9i GenX")
Reported-by: default avatarDan Carpenter <error27@gmail.com>
Closes: https://lore.kernel.org/linux-sound/aenFesLAStjrVNy8@stanley.mountain/T/#u


Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://patch.msgid.link/20260428130531.169600-1-rf@opensource.cirrus.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b0e2333a

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

+7 −5
Original line number Diff line number Diff line
@@ -976,6 +976,7 @@ static int cs35l56_hda_system_resume(struct device *dev) 
static int cs35l56_hda_fixup_yoga9(struct cs35l56_hda *cs35l56, int *bus_addr)

{

	/* The cirrus,dev-index property has the wrong values */

	cs35l56->num_amps = 2;

	switch (*bus_addr) {

	case 0x30:

		cs35l56->index = 1;
@@ -1025,7 +1026,6 @@ static int cs35l56_hda_read_acpi(struct cs35l56_hda *cs35l56, int hid, int id) 
	char hid_string[8];

	struct acpi_device *adev;

	const char *property, *sub;

	size_t nval;

	int i, ret;



	/*
@@ -1061,13 +1061,14 @@ static int cs35l56_hda_read_acpi(struct cs35l56_hda *cs35l56, int hid, int id) 
			ret = -EINVAL;

			goto err;

		}

		nval = ret;

		cs35l56->num_amps = ret;



		ret = device_property_read_u32_array(cs35l56->base.dev, property, values, nval);

		ret = device_property_read_u32_array(cs35l56->base.dev, property, values,

						     cs35l56->num_amps);

		if (ret)

			goto err;



		for (i = 0; i < nval; i++) {

		for (i = 0; i < cs35l56->num_amps; i++) {

			if (values[i] == id) {

				cs35l56->index = i;

				break;
@@ -1090,7 +1091,8 @@ static int cs35l56_hda_read_acpi(struct cs35l56_hda *cs35l56, int hid, int id) 
			 "Read ACPI _SUB failed(%ld): fallback to generic firmware\n",

			 PTR_ERR(sub));

	} else {

		ret = cirrus_scodec_get_speaker_id(cs35l56->base.dev, cs35l56->index, nval, -1);

		ret = cirrus_scodec_get_speaker_id(cs35l56->base.dev, cs35l56->index,

						   cs35l56->num_amps, -1);

		if (ret == -ENOENT) {

			cs35l56->system_name = sub;

		} else if (ret >= 0) {

sound/hda/codecs/side-codecs/cs35l56_hda.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ struct cs35l56_hda { 
	struct work_struct dsp_work;



	int index;

	int num_amps;

	const char *system_name;

	const char *amp_name;