Commit 2ebab40e authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Fix bad dereference of jack object 



The hda_jack_tbl entries are managed by snd_array for allowing
multiple jacks.  It's good per se, but the problem is that struct
hda_jack_callback keeps the hda_jack_tbl pointer.  Since snd_array
doesn't preserve each pointer at resizing the array, we can't keep the
original pointer but have to deduce the pointer at each time via
snd_array_entry() instead.  Actually, this resulted in the deference
to the wrong pointer on codecs that have many pins such as CS4208.

This patch replaces the pointer to the NID value as the search key.
As an unexpected good side effect, this even simplifies the code, as
only NID is needed in most cases.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c44d9b11

sound/pci/hda/hda_generic.c

+2 −2
Original line number Diff line number Diff line
@@ -4028,9 +4028,9 @@ static void pin_power_callback(struct hda_codec *codec, 
			       struct hda_jack_callback *jack,

			       bool on)

{

	if (jack && jack->tbl->nid)

	if (jack && jack->nid)

		sync_power_state_change(codec,

					set_pin_power_jack(codec, jack->tbl->nid, on));

					set_pin_power_jack(codec, jack->nid, on));

}



/* callback only doing power up -- called at first */

sound/pci/hda/hda_jack.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid, 
		if (!callback)

			return ERR_PTR(-ENOMEM);

		callback->func = func;

		callback->tbl = jack;

		callback->nid = jack->nid;

		callback->next = jack->callback;

		jack->callback = callback;

	}

sound/pci/hda/hda_jack.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ struct hda_jack_callback; 
typedef void (*hda_jack_callback_fn) (struct hda_codec *, struct hda_jack_callback *);



struct hda_jack_callback {

	struct hda_jack_tbl *tbl;

	hda_nid_t nid;

	hda_jack_callback_fn func;

	unsigned int private_data;	/* arbitrary data */

	struct hda_jack_callback *next;

sound/pci/hda/patch_ca0132.c

+4 −1
Original line number Diff line number Diff line
@@ -4427,13 +4427,16 @@ static void ca0132_process_dsp_response(struct hda_codec *codec, 
static void hp_callback(struct hda_codec *codec, struct hda_jack_callback *cb)

{

	struct ca0132_spec *spec = codec->spec;

	struct hda_jack_tbl *tbl;



	/* Delay enabling the HP amp, to let the mic-detection

	 * state machine run.

	 */

	cancel_delayed_work_sync(&spec->unsol_hp_work);

	schedule_delayed_work(&spec->unsol_hp_work, msecs_to_jiffies(500));

	cb->tbl->block_report = 1;

	tbl = snd_hda_jack_tbl_get(codec, cb->nid);

	if (tbl)

		tbl->block_report = 1;

}



static void amic_callback(struct hda_codec *codec, struct hda_jack_callback *cb)

sound/pci/hda/patch_hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -1194,7 +1194,7 @@ static void check_presence_and_report(struct hda_codec *codec, hda_nid_t nid) 
static void jack_callback(struct hda_codec *codec,

			  struct hda_jack_callback *jack)

{

	check_presence_and_report(codec, jack->tbl->nid);

	check_presence_and_report(codec, jack->nid);

}



static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)

CRA Git | Maintained and supported by SUSTech CRA and CCSE