August 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 0/4] ALSA: usb-audio: More strict validation and cleanups
by Takashi Iwai 22 Aug '19

22 Aug '19

Hi, this patchset introduces a more comprehensive validation code for USB-audio descriptor units, mainly for mixer stuff, for yet more hardening against the malformed descriptors. The rest are rather cleanups. Takashi === Takashi Iwai (4): ALSA: usb-audio: More validations of descriptor units ALSA: usb-audio: Simplify parse_audio_unit() ALSA: usb-audio: Unify the release of usb_mixer_elem_info objects ALSA: usb-audio: Remove superfluous bLength checks sound/usb/Makefile | 3 +- sound/usb/clock.c | 14 +-- sound/usb/helper.h | 4 + sound/usb/mixer.c | 237 ++++++++++++------------------------ sound/usb/power.c | 2 + sound/usb/quirks.c | 3 + sound/usb/stream.c | 25 ++-- sound/usb/validate.c | 332 +++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 439 insertions(+), 181 deletions(-) create mode 100644 sound/usb/validate.c -- 2.16.4

2 10

[alsa-devel] [PATCH 1/2] ALSA: hda/realtek - Check beep whitelist before assigning in all codecs
by Takashi Iwai 22 Aug '19

22 Aug '19

Some Realtek codec parsers didn't check the availability of PC beep. Add has_cdefine_beep() check appropriately. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b6ae452a1d8f..19831521bd95 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -2848,7 +2848,8 @@ static int patch_alc268(struct hda_codec *codec) return err; spec = codec->spec; - spec->gen.beep_nid = 0x01; + if (has_cdefine_beep(codec)) + spec->gen.beep_nid = 0x01; spec->shutup = alc_eapd_shutup; @@ -8102,7 +8103,8 @@ static int patch_alc861(struct hda_codec *codec) return err; spec = codec->spec; - spec->gen.beep_nid = 0x23; + if (has_cdefine_beep(codec)) + spec->gen.beep_nid = 0x23; #ifdef CONFIG_PM spec->power_hook = alc_power_eapd; @@ -8203,7 +8205,8 @@ static int patch_alc861vd(struct hda_codec *codec) return err; spec = codec->spec; - spec->gen.beep_nid = 0x23; + if (has_cdefine_beep(codec)) + spec->gen.beep_nid = 0x23; spec->shutup = alc_eapd_shutup; -- 2.16.4

1 1

[alsa-devel] [PATCH] ALSA: usb-audio: Check mixer unit bitmap yet more strictly
by Takashi Iwai 22 Aug '19

22 Aug '19

The bmControls (for UAC1) or bmMixerControls (for UAC2/3) bitmap has a variable size depending on both input and output pins. Its size is to fit with input * output bits. The problem is that the input size can't be determined simply from the unit descriptor itself but it needs to parse the whole connected sources. Although the uac_mixer_unit_get_channels() tries to check some possible overflow of this bitmap, it's incomplete due to the lack of the evaluation of input pins. For covering possible overflows, this patch adds the bitmap overflow check in the loop of input pins in parse_audio_mixer_unit(). Fixes: 0bfe5e434e66 ("ALSA: usb-audio: Check mixer unit descriptors more strictly") Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/mixer.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index b5927c3d5bc0..27ee68a507a2 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -739,7 +739,6 @@ static int uac_mixer_unit_get_channels(struct mixer_build *state, struct uac_mixer_unit_descriptor *desc) { int mu_channels; - void *c; if (desc->bLength < sizeof(*desc)) return -EINVAL; @@ -762,13 +761,6 @@ static int uac_mixer_unit_get_channels(struct mixer_build *state, break; } - if (!mu_channels) - return 0; - - c = uac_mixer_unit_bmControls(desc, state->mixer->protocol); - if (c - (void *)desc + (mu_channels - 1) / 8 >= desc->bLength) - return 0; /* no bmControls -> skip */ - return mu_channels; } @@ -2009,6 +2001,29 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, * Mixer Unit */ +/* check whether the given in/out overflows bmMixerControls matrix */ +static bool mixer_bitmap_overflow(struct uac_mixer_unit_descriptor *desc, + int protocol, int num_ins, int num_outs) +{ + u8 *hdr = (u8 *)desc; + u8 *c = uac_mixer_unit_bmControls(desc, protocol); + size_t rest; /* remaining bytes after bmMixerControls */ + + switch (protocol) { + case UAC_VERSION_1: + default: + rest = 1; /* iMixer */ + case UAC_VERSION_2: + rest = 2; /* bmControls + iMixer */ + case UAC_VERSION_3: + rest = 6; /* bmControls + wMixerDescrStr */ + break; + } + + /* overflow? */ + return c + (num_ins * num_outs + 7) / 8 + rest > hdr + hdr[0]; +} + /* * build a mixer unit control * @@ -2137,6 +2152,9 @@ static int parse_audio_mixer_unit(struct mixer_build *state, int unitid, if (err < 0) return err; num_ins += iterm.channels; + if (mixer_bitmap_overflow(desc, state->mixer->protocol, + num_ins, num_outs)) + break; for (; ich < num_ins; ich++) { int och, ich_has_controls = 0; -- 2.16.4

1 0

[alsa-devel] [RFC PATCH 00/11] soundwire: intel: simplify DAI/PDI handling
by Pierre-Louis Bossart 21 Aug '19

21 Aug '19

In the initial SoundWire code released by Intel, the PDIs and ports on the Master interface were dynamically allocated. This wasn't a bad idea at the time and would have allowed for interesting routing. Fast-forward to 2019, with the hardware available on CometLake/IceLake, that dynamic allocation makes it complicated to deal with statically-allocated ASoC dailinks and topology-defined DAIs. In this series, we suggest a drastic simplification where the SoundWire code reuses information provided by DAIs and dailinks. We also suggest removing the dynamic allocation of ports on the master since in practice there is a 1:1 mapping between ports and PDIs. In the second part of the series, we suggest adding new callbacks to SoundWire DAIs, so that all the SoundWire stream operations are contained at the DAI level. This solution results in a very simple integration with the SOF code (which will be shared in a separate series since SOF will not apply directly on top of soundwire/next). The SOF parts only call a SoundWire init/release API, and provides 2 callbacks for hw_params and free, with all the details of the SoundWire DAIs and IP handled in drivers/soundwire. This solution has been tested on CometLake/IceLake with simple capture/playback. When ASoC supports the multi-cpu capability needed for synchronized playback/capture across multiple links, we will have to modify slightly this solution so that the stream alloc, release and trigger operations are done once. This is future work that will take place later, likely after 5.4, and which should not impact the SOF integration. The code in this patchset is the result of collaboration between Bard Liao, Rander Wang and Pierre Bossart, with ideas coming from all 3 sides. It's likely that there are still some parts in the code that can be improved, hence the RFC state. Bard Liao (3): soundwire: intel: fix intel_register_dai PDI offsets and numbers soundwire: intel: remove playback/capture stream_name soundwire: cadence_master: improve PDI allocation Pierre-Louis Bossart (3): soundwire: remove DAI_ID_RANGE definitions soundwire: cadence/intel: simplify PDI/port mapping soundwire: intel: don't filter out PDI0/1 Rander Wang (5): soundwire: intel: improve .config_stream callback, add .free_stream soundwire: intel: add prepare support in sdw dai driver soundwire: intel: add trigger support in sdw dai driver soundwire: intel: do sdw stream setup in setup function soundwire: intel: free all resources on hw_free() drivers/soundwire/cadence_master.c | 158 ++++------------ drivers/soundwire/cadence_master.h | 34 +--- drivers/soundwire/intel.c | 278 ++++++++++++++++------------ include/linux/soundwire/sdw.h | 3 - include/linux/soundwire/sdw_intel.h | 4 +- 5 files changed, 209 insertions(+), 268 deletions(-) -- 2.20.1

1 11

[alsa-devel] [PATCH] ALSA: line6: Fix memory leak at line6_init_pcm() error path
by Takashi Iwai 21 Aug '19

21 Aug '19

I forgot to release the allocated object at the early error path in line6_init_pcm(). For addressing it, slightly shuffle the code so that the PCM destructor (pcm->private_free) is assigned properly before all error paths. Fixes: 3450121997ce ("ALSA: line6: Fix write on zero-sized buffer") Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/line6/pcm.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c index 2c03e0f6bf72..f70211e6b174 100644 --- a/sound/usb/line6/pcm.c +++ b/sound/usb/line6/pcm.c @@ -550,6 +550,15 @@ int line6_init_pcm(struct usb_line6 *line6, line6pcm->volume_monitor = 255; line6pcm->line6 = line6; + spin_lock_init(&line6pcm->out.lock); + spin_lock_init(&line6pcm->in.lock); + line6pcm->impulse_period = LINE6_IMPULSE_DEFAULT_PERIOD; + + line6->line6pcm = line6pcm; + + pcm->private_data = line6pcm; + pcm->private_free = line6_cleanup_pcm; + line6pcm->max_packet_size_in = usb_maxpacket(line6->usbdev, usb_rcvisocpipe(line6->usbdev, ep_read), 0); @@ -562,15 +571,6 @@ int line6_init_pcm(struct usb_line6 *line6, return -EINVAL; } - spin_lock_init(&line6pcm->out.lock); - spin_lock_init(&line6pcm->in.lock); - line6pcm->impulse_period = LINE6_IMPULSE_DEFAULT_PERIOD; - - line6->line6pcm = line6pcm; - - pcm->private_data = line6pcm; - pcm->private_free = line6_cleanup_pcm; - err = line6_create_audio_out_urbs(line6pcm); if (err < 0) return err; -- 2.16.4

1 0

[alsa-devel] [PATCH 00/17] soundwire: fixes for 5.4
by Pierre-Louis Bossart 21 Aug '19

21 Aug '19

This series provides an update on the initial RFC. Debugfs and Intel updates will be provided in follow-up patches. The order of patches was changed since the RFC so detailed change logs are provided below. Changes since RFC: patch1: feedback from Vinod and Cezary use local variable to reduce number of de-references document that first argument is mandatory patch2: feedback from Vinod document that the work-around is required for all existing controllers patch 3: feedback from Vinod clarify comment that MCP_INT_IRQ ungates all other settings. use MCP_INT_SLAVE_MASK instead of all individual settings ORed. Patch 4: feedback from Vinod: demote dynamic debug log to dev_dbg (was dev_err) patch5: clarify commit message that the helpers will be used in the Cadence parts as well. patch 6: feedback from Vinod s/BIOS/firmware remove magic numbers, introduce macros patch 7: add kbuild warning message in commit message patch 8: no change patch 9: feedback from Guennadi remove unnecessary initializations patch 10/11/12: feedback from Vinod split initial patch in 3 (prototype, Intel, Cadence) add explanations on what mclk_freq is in commit messages remove pr_err logs missed in RFC patch 13: feedback from Bard remove unecessary reads before update patch 14: no change patch 15: update commit message patch 16: update commit message remove unnecessary dynamic debug log patch 17: no change Bard liao (1): soundwire: include mod_devicetable.h to avoid compiling warnings Pierre-Louis Bossart (15): soundwire: intel: prevent possible dereference in hw_params soundwire: intel: fix channel number reported by hardware soundwire: cadence_master: revisit interrupt settings soundwire: bus: improve dynamic debug comments for enumeration soundwire: export helpers to find row and column values soundwire: cadence_master: use firmware defaults for frame shape soundwire: stream: fix disable sequence soundwire: stream: remove unnecessary variable initializations soundwire: add new mclk_freq field for properties soundwire: intel: read mclk_freq property from firmware soundwire: cadence_master: make use of mclk_freq property soundwire: intel: handle disabled links soundwire: intel_init: add kernel module parameter to filter out links soundwire: cadence_master: add kernel parameter to override interrupt mask soundwire: intel: move shutdown() callback and don't export symbol Rander Wang (1): soundwire: cadence_master: fix divider setting in clock register drivers/soundwire/bus.c | 5 +- drivers/soundwire/bus.h | 7 +- drivers/soundwire/cadence_master.c | 102 +++++++++++++++++++--------- drivers/soundwire/cadence_master.h | 2 - drivers/soundwire/intel.c | 83 ++++++++++++++++++++-- drivers/soundwire/intel_init.c | 11 +++ drivers/soundwire/stream.c | 93 ++++++++++++++++--------- include/linux/soundwire/sdw.h | 6 ++ include/linux/soundwire/sdw_intel.h | 1 + 9 files changed, 236 insertions(+), 74 deletions(-) -- 2.20.1

3 26

[alsa-devel] [PATCH] ASoC: SOF: topology: fix get control data return type and arguments
by Jaska Uimonen 21 Aug '19

21 Aug '19

From: Jaska Uimonen <jaska.uimonen(a)intel.com> sof_get_control_data returns negative values even though the return value is defined unsigned (size_t). So change the return value type to int. Add the data size as pointer argument to sof_get_control_data to avoid ambiquity in the meaning of the return type. Also make the sof_get_control_data to return -EINVAL if data pointer is valid but the size is for some reason zero. Fixes: cac974a51ebb ("ASoC: SOF: topology: use set_get_data in process load") Reported by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Jaska Uimonen <jaska.uimonen(a)intel.com> --- sound/soc/sof/topology.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 28a7a6e06a53..8288b1758542 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1752,15 +1752,15 @@ static int sof_widget_load_siggen(struct snd_soc_component *scomp, int index, return ret; } -static size_t sof_get_control_data(struct snd_sof_dev *sdev, - struct snd_soc_dapm_widget *widget, - struct sof_widget_data *wdata) +static int sof_get_control_data(struct snd_sof_dev *sdev, + struct snd_soc_dapm_widget *widget, + struct sof_widget_data *wdata, + size_t *size) { const struct snd_kcontrol_new *kc; struct soc_mixer_control *sm; struct soc_bytes_ext *sbe; struct soc_enum *se; - size_t size = 0; int i; for (i = 0; i < widget->num_kcontrols; i++) { @@ -1800,7 +1800,11 @@ static size_t sof_get_control_data(struct snd_sof_dev *sdev, if (wdata[i].pdata->magic != SOF_ABI_MAGIC) return -EINVAL; - size += wdata[i].pdata->size; + /* don't accept 0 size for data */ + if (!wdata[i].pdata->size) + return -EINVAL; + + *size += wdata[i].pdata->size; /* get data type */ switch (wdata[i].control->cmd) { @@ -1819,7 +1823,7 @@ static size_t sof_get_control_data(struct snd_sof_dev *sdev, } } - return size; + return 0; } static int sof_process_load(struct snd_soc_component *scomp, int index, @@ -1855,12 +1859,11 @@ static int sof_process_load(struct snd_soc_component *scomp, int index, return -ENOMEM; /* get possible component controls and get size of all pdata */ - ipc_data_size = sof_get_control_data(sdev, widget, wdata); + ret = sof_get_control_data(sdev, widget, wdata, + &ipc_data_size); - if (ipc_data_size <= 0) { - ret = ipc_data_size; + if (ret < 0) goto out; - } } ipc_size = sizeof(struct sof_ipc_comp_process) + -- 2.13.6

3 2

[alsa-devel] [PATCH v2] ASoC: SOF: topology: fix get control data return type and arguments
by Jaska Uimonen 21 Aug '19

21 Aug '19

From: Jaska Uimonen <jaska.uimonen(a)intel.com> sof_get_control_data returns negative values even though the return value is defined unsigned (size_t). So change the return value type to int and add the data size as pointer argument to sof_get_control_data to avoid ambiquity in the meaning of the return type. Fixes: cac974a51ebb ("ASoC: SOF: topology: use set_get_data in process load") Reported by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Jaska Uimonen <jaska.uimonen(a)intel.com> --- sound/soc/sof/topology.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 28a7a6e06a53..fc85efbad378 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1752,17 +1752,19 @@ static int sof_widget_load_siggen(struct snd_soc_component *scomp, int index, return ret; } -static size_t sof_get_control_data(struct snd_sof_dev *sdev, - struct snd_soc_dapm_widget *widget, - struct sof_widget_data *wdata) +static int sof_get_control_data(struct snd_sof_dev *sdev, + struct snd_soc_dapm_widget *widget, + struct sof_widget_data *wdata, + size_t *size) { const struct snd_kcontrol_new *kc; struct soc_mixer_control *sm; struct soc_bytes_ext *sbe; struct soc_enum *se; - size_t size = 0; int i; + *size = 0; + for (i = 0; i < widget->num_kcontrols; i++) { kc = &widget->kcontrol_news[i]; @@ -1800,7 +1802,7 @@ static size_t sof_get_control_data(struct snd_sof_dev *sdev, if (wdata[i].pdata->magic != SOF_ABI_MAGIC) return -EINVAL; - size += wdata[i].pdata->size; + *size += wdata[i].pdata->size; /* get data type */ switch (wdata[i].control->cmd) { @@ -1819,7 +1821,7 @@ static size_t sof_get_control_data(struct snd_sof_dev *sdev, } } - return size; + return 0; } static int sof_process_load(struct snd_soc_component *scomp, int index, @@ -1855,12 +1857,11 @@ static int sof_process_load(struct snd_soc_component *scomp, int index, return -ENOMEM; /* get possible component controls and get size of all pdata */ - ipc_data_size = sof_get_control_data(sdev, widget, wdata); + ret = sof_get_control_data(sdev, widget, wdata, + &ipc_data_size); - if (ipc_data_size <= 0) { - ret = ipc_data_size; + if (ret < 0) goto out; - } } ipc_size = sizeof(struct sof_ipc_comp_process) + -- 2.13.6

1 0

[alsa-devel] [PATCH v2 0/4] ASoC: sun4i-i2s: Number of fixes and TDM Support
by Maxime Ripard 21 Aug '19

21 Aug '19

From: Maxime Ripard <maxime.ripard(a)bootlin.com> Hi, This series aims at fixing a number of issues in the current i2s driver, mostly related to the i2s master support and the A83t support. It also uses that occasion to cleanup a few things and simplify the driver. Finally, it builds on those fixes and cleanups to introduce TDM and DSP formats support. Let me know what you think, Maxime Changes from v1: - Removed patches applied - Refactor a bit the call to sun4i_i2s_set_clk_rate - Fix build issue - Add an extra patch to cleanup sun4i_i2s_hw_params Maxime Ripard (4): ASoC: sun4i-i2s: Use the physical / slot width for the clocks ASoC: sun4i-i2s: Use the actual format width instead of an hardcoded one ASoC: sun4i-i2s: Replace call to params_width by local variable ASoC: sun4i-i2s: Add support for DSP formats sound/soc/sunxi/sun4i-i2s.c | 58 ++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 15 deletions(-) base-commit: 137befe19f310400a8b20fd8a4ce8c4141aafde0 -- git-series 0.9.1

1 4

[alsa-devel] [PATCH 0/2] Add support for i.MX8QM
by Daniel Baluta 21 Aug '19

21 Aug '19

i.MX8QM SOC integrates 6 SAI instances. Register map is similar with i.MX6 series. Daniel Baluta (2): ASoC: fsl_sai: Add support for imx8qm ASoC: dt-bindings: Introduce compatible string for imx8qm Documentation/devicetree/bindings/sound/fsl-sai.txt | 3 ++- sound/soc/fsl/fsl_sai.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) -- 2.17.1

2 4