Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2c15aff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A series of small fixes in ASoC, HD-audio and core stuff:

   - a UAF fix in ALSA PCM core

   - yet more hardening for ALSA sequencer

   - a regression fix for the previous HD-audio power_save option change

   - various ASoC codec fixes (sgtl5000, rt5651, hdmi-codec, wm_adsp)

   - minor ASoC platform fixes (AMD ACP, sun4i)"

* tag 'sound-4.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Revert power_save option default value
  ALSA: pcm: Fix UAF in snd_pcm_oss_get_formats()
  ALSA: seq: Clear client entry before deleting else at closing
  ALSA: seq: Fix possible UAF in snd_seq_check_queue()
  ASoC: amd: 16bit resolution support for i2s sp instance
  ASoC: wm_adsp: For TLV controls only register TLV get/set
  ASoC: sun4i-i2s: Fix RX slot number of SUN8I
  ASoC: hdmi-codec: Fix module unloading caused kernel crash
  ASoC: rt5651: Fix regcache sync errors on resume
  ASoC: sgtl5000: Fix suspend/resume
  MAINTAINERS: Add myself as sgtl5000 maintainer
  ASoC: samsung: Add the DT binding files entry to MAINTAINERS
  sgtl5000: change digital_mute policy
parents 667058ae db45dc95

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -9925,6 +9925,13 @@ F: Documentation/ABI/stable/sysfs-bus-nvmem 
F:	include/linux/nvmem-consumer.h

F:	include/linux/nvmem-provider.h



NXP SGTL5000 DRIVER

M:	Fabio Estevam <fabio.estevam@nxp.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/sound/sgtl5000.txt

F:	sound/soc/codecs/sgtl5000*



NXP TDA998X DRM DRIVER

M:	Russell King <linux@armlinux.org.uk>

S:	Supported
@@ -12107,6 +12114,7 @@ M: Sylwester Nawrocki <s.nawrocki@samsung.com> 
L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	sound/soc/samsung/

F:	Documentation/devicetree/bindings/sound/samsung*



SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER

M:	Krzysztof Kozlowski <krzk@kernel.org>

sound/core/oss/pcm_oss.c

+6 −4
Original line number Diff line number Diff line
@@ -1762,10 +1762,9 @@ static int snd_pcm_oss_get_formats(struct snd_pcm_oss_file *pcm_oss_file) 
		return -ENOMEM;

	_snd_pcm_hw_params_any(params);

	err = snd_pcm_hw_refine(substream, params);

	format_mask = hw_param_mask_c(params, SNDRV_PCM_HW_PARAM_FORMAT);

	kfree(params);

	if (err < 0)

		return err;

		goto error;

	format_mask = hw_param_mask_c(params, SNDRV_PCM_HW_PARAM_FORMAT);

	for (fmt = 0; fmt < 32; ++fmt) {

		if (snd_mask_test(format_mask, fmt)) {

			int f = snd_pcm_oss_format_to(fmt);
@@ -1773,7 +1772,10 @@ static int snd_pcm_oss_get_formats(struct snd_pcm_oss_file *pcm_oss_file) 
				formats |= f;

		}

	}

	return formats;



 error:

	kfree(params);

	return err < 0 ? err : formats;

}



static int snd_pcm_oss_set_format(struct snd_pcm_oss_file *pcm_oss_file, int format)

sound/core/seq/seq_clientmgr.c

+2 −2
Original line number Diff line number Diff line
@@ -255,12 +255,12 @@ static int seq_free_client1(struct snd_seq_client *client) 


	if (!client)

		return 0;

	snd_seq_delete_all_ports(client);

	snd_seq_queue_client_leave(client->number);

	spin_lock_irqsave(&clients_lock, flags);

	clienttablock[client->number] = 1;

	clienttab[client->number] = NULL;

	spin_unlock_irqrestore(&clients_lock, flags);

	snd_seq_delete_all_ports(client);

	snd_seq_queue_client_leave(client->number);

	snd_use_lock_sync(&client->use_lock);

	snd_seq_queue_client_termination(client->number);

	if (client->pool)

sound/core/seq/seq_prioq.c

+14 −14
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ void snd_seq_prioq_delete(struct snd_seq_prioq **fifo) 
	if (f->cells > 0) {

		/* drain prioQ */

		while (f->cells > 0)

			snd_seq_cell_free(snd_seq_prioq_cell_out(f));

			snd_seq_cell_free(snd_seq_prioq_cell_out(f, NULL));

	}

	

	kfree(f);
@@ -214,8 +214,18 @@ int snd_seq_prioq_cell_in(struct snd_seq_prioq * f, 
	return 0;

}



/* return 1 if the current time >= event timestamp */

static int event_is_ready(struct snd_seq_event *ev, void *current_time)

{

	if ((ev->flags & SNDRV_SEQ_TIME_STAMP_MASK) == SNDRV_SEQ_TIME_STAMP_TICK)

		return snd_seq_compare_tick_time(current_time, &ev->time.tick);

	else

		return snd_seq_compare_real_time(current_time, &ev->time.time);

}



/* dequeue cell from prioq */

struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f)

struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f,

						  void *current_time)

{

	struct snd_seq_event_cell *cell;

	unsigned long flags;
@@ -227,6 +237,8 @@ struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f) 
	spin_lock_irqsave(&f->lock, flags);



	cell = f->head;

	if (cell && current_time && !event_is_ready(&cell->event, current_time))

		cell = NULL;

	if (cell) {

		f->head = cell->next;
@@ -252,18 +264,6 @@ int snd_seq_prioq_avail(struct snd_seq_prioq * f) 
	return f->cells;

}





/* peek at cell at the head of the prioq */

struct snd_seq_event_cell *snd_seq_prioq_cell_peek(struct snd_seq_prioq * f)

{

	if (f == NULL) {

		pr_debug("ALSA: seq: snd_seq_prioq_cell_in() called with NULL prioq\n");

		return NULL;

	}

	return f->head;

}





static inline int prioq_match(struct snd_seq_event_cell *cell,

			      int client, int timestamp)

{

sound/core/seq/seq_prioq.h

+2 −4
Original line number Diff line number Diff line
@@ -44,14 +44,12 @@ void snd_seq_prioq_delete(struct snd_seq_prioq **fifo); 
int snd_seq_prioq_cell_in(struct snd_seq_prioq *f, struct snd_seq_event_cell *cell);



/* dequeue cell from prioq */ 

struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f);

struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f,

						  void *current_time);



/* return number of events available in prioq */

int snd_seq_prioq_avail(struct snd_seq_prioq *f);



/* peek at cell at the head of the prioq */

struct snd_seq_event_cell *snd_seq_prioq_cell_peek(struct snd_seq_prioq *f);



/* client left queue */

void snd_seq_prioq_leave(struct snd_seq_prioq *f, int client, int timestamp);