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

[alsa-devel] Suspected heap overflow in snd_midi_event_encode_byte()
by Prashant Malani 28 Aug '18

28 Aug '18

Hi, The Chromium fuzzers detected a potential heap overflow in snd_midi_event_encode_byte() when attempting to encode an invalid data sequence. The potential bug was observed in alsa-lib-1.1.5 (the source seems similar to alsa-lib-1.1.6 so it is likely present there too). Code to reproduce (condensed to fit in an email): std::array<int, 4> arr{ {0x0A, 0x0B, 0x0C, 0x0D} }; snd_midi_event_t* encoder; snd_midi_event_new(arr.size(), &encoder); for (int i = 0; i < arr.size(); i++) { snd_seq_event_t event; int result = snd_midi_event_encode_byte(encoder, arr[i], &event); if (result < 0) { // Log error and return.... } if ( result == 1) { // Send the completed message and return. } } .... The first call to snd_midi_event_encode_byte() using byte 0x0A causes the |encoder->qlen| to underflow and become a large unsigned value, and |encoder->read| to become 2. Subsequent bytes processed will get written to the |encoder->buf| buffer, with |dev->read| getting incremented after every byte. As a result, by the time we get to byte 0x0D, |encoder->read| is already 4, and this results in a heap overflow (relevant line in alsa-lib is src/seq/seq_midi_event.c:425) I'm not sure if the above input array is a valid input to snd_midi_event_encode_byte(), but I'm guessing we should be doing some error checking to make sure we're not processing incorrect/unexpected/invalid bytes. Any suggestions about how one can submit a fix for this? Best regards, Prashant

3 7

[alsa-devel] [PATCH v2] ASoC: Convert to using %pOFn instead of device_node.name
by Rob Herring 28 Aug '18

28 Aug '18

In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier. Cc: Timur Tabi <timur(a)kernel.org> Cc: Nicolin Chen <nicoleotsuka(a)gmail.com> Cc: Xiubo Li <Xiubo.Lee(a)gmail.com> Cc: Fabio Estevam <fabio.estevam(a)nxp.com> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Carlo Caione <carlo(a)caione.org> Cc: Kevin Hilman <khilman(a)baylibre.com> Cc: Olivier Moysan <olivier.moysan(a)st.com> Cc: Arnaud Pouliquen <arnaud.pouliquen(a)st.com> Cc: Maxime Coquelin <mcoquelin.stm32(a)gmail.com> Cc: Alexandre Torgue <alexandre.torgue(a)st.com> Cc: alsa-devel(a)alsa-project.org Cc: linuxppc-dev(a)lists.ozlabs.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-amlogic(a)lists.infradead.org Signed-off-by: Rob Herring <robh(a)kernel.org> --- v2: - stm32_sai_sub: Unwrap now shorter line sound/soc/fsl/fsl_esai.c | 2 +- sound/soc/fsl/fsl_utils.c | 4 ++-- sound/soc/meson/axg-card.c | 2 +- sound/soc/stm/stm32_sai.c | 2 +- sound/soc/stm/stm32_sai_sub.c | 7 +++---- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index c1d1d06783e5..57b484768a58 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -807,7 +807,7 @@ static int fsl_esai_probe(struct platform_device *pdev) return -ENOMEM; esai_priv->pdev = pdev; - strncpy(esai_priv->name, np->name, sizeof(esai_priv->name) - 1); + snprintf(esai_priv->name, sizeof(esai_priv->name), "%pOFn", np); /* Get the addresses and IRQ */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); diff --git a/sound/soc/fsl/fsl_utils.c b/sound/soc/fsl/fsl_utils.c index 7f0fa4b52223..9981668ab590 100644 --- a/sound/soc/fsl/fsl_utils.c +++ b/sound/soc/fsl/fsl_utils.c @@ -57,8 +57,8 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np, of_node_put(dma_channel_np); return ret; } - snprintf((char *)dai->platform_name, DAI_NAME_SIZE, "%llx.%s", - (unsigned long long) res.start, dma_channel_np->name); + snprintf((char *)dai->platform_name, DAI_NAME_SIZE, "%llx.%pOFn", + (unsigned long long) res.start, dma_channel_np); iprop = of_get_property(dma_channel_np, "cell-index", NULL); if (!iprop) { diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index 2914ba0d965b..b76a5f4f1785 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -478,7 +478,7 @@ static int axg_card_set_be_link(struct snd_soc_card *card, ret = axg_card_set_link_name(card, link, "be"); if (ret) - dev_err(card->dev, "error setting %s link name\n", np->name); + dev_err(card->dev, "error setting %pOFn link name\n", np); return ret; } diff --git a/sound/soc/stm/stm32_sai.c b/sound/soc/stm/stm32_sai.c index f22654253c43..d597eba61992 100644 --- a/sound/soc/stm/stm32_sai.c +++ b/sound/soc/stm/stm32_sai.c @@ -104,7 +104,7 @@ static int stm32_sai_set_sync(struct stm32_sai_data *sai_client, if (!pdev) { dev_err(&sai_client->pdev->dev, - "Device not found for node %s\n", np_provider->name); + "Device not found for node %pOFn\n", np_provider); return -ENODEV; } diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index 06fba9650ac4..56a227e0bd71 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -1124,16 +1124,15 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev, sai->sync = SAI_SYNC_NONE; if (args.np) { if (args.np == np) { - dev_err(&pdev->dev, "%s sync own reference\n", - np->name); + dev_err(&pdev->dev, "%pOFn sync own reference\n", np); of_node_put(args.np); return -EINVAL; } sai->np_sync_provider = of_get_parent(args.np); if (!sai->np_sync_provider) { - dev_err(&pdev->dev, "%s parent node not found\n", - np->name); + dev_err(&pdev->dev, "%pOFn parent node not found\n", + np); of_node_put(args.np); return -ENODEV; } -- 2.17.1

2 1

[alsa-devel] [PATCH] [sound] hdac-codec runtime suspended at PM:Suspend.
by Anshuman Gupta 28 Aug '18

28 Aug '18

Keep hdac-codec to be in runtime suspended while entering to suspend. If hdac-codec is already in runtime suspend state skip its power down sequence in prepare, power up sequence in complete phase. Avoid resuming hdac controller PCI device 00:1f.3 from runtime suspend state in case hdac-codec already in runtime-suspend state, this is unnecessary and block the direct complete even for hdac controller PCI device 00:1f.3. This enabled direct complete path for hdac-codec and PCI device 00:1f.3. Signed-off-by: Anshuman Gupta <anshuman.gupta(a)intel.com> --- sound/soc/codecs/hdac_hdmi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index f3b4f4d..810a8a6 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -1852,6 +1852,8 @@ static int hdmi_codec_prepare(struct device *dev) struct hdac_ext_device *edev = to_hda_ext_device(dev); struct hdac_device *hdac = &edev->hdac; + if (pm_runtime_status_suspended(dev)) + return 1; pm_runtime_get_sync(&edev->hdac.dev); /* @@ -1873,6 +1875,8 @@ static void hdmi_codec_complete(struct device *dev) struct hdac_hdmi_priv *hdmi = edev->private_data; struct hdac_device *hdac = &edev->hdac; + if (pm_runtime_status_suspended(dev)) + return; /* Power up afg */ snd_hdac_codec_read(hdac, hdac->afg, 0, AC_VERB_SET_POWER_STATE, AC_PWRST_D0); -- 2.7.4

3 6

[alsa-devel] [PATCH] ALSA: seq: Do error checks at creating system ports
by Takashi Iwai 28 Aug '18

28 Aug '18

snd_seq_system_client_init() doesn't check the errors returned from its port creations. Let's do it properly and handle the error paths. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/seq/seq_system.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sound/core/seq/seq_system.c b/sound/core/seq/seq_system.c index 3b89b0adad6a..0dc5d5a45ecc 100644 --- a/sound/core/seq/seq_system.c +++ b/sound/core/seq/seq_system.c @@ -123,6 +123,7 @@ int __init snd_seq_system_client_init(void) { struct snd_seq_port_callback pcallbacks; struct snd_seq_port_info *port; + int err; port = kzalloc(sizeof(*port), GFP_KERNEL); if (!port) @@ -148,7 +149,10 @@ int __init snd_seq_system_client_init(void) port->flags = SNDRV_SEQ_PORT_FLG_GIVEN_PORT; port->addr.client = sysclient; port->addr.port = SNDRV_SEQ_PORT_SYSTEM_TIMER; - snd_seq_kernel_client_ctl(sysclient, SNDRV_SEQ_IOCTL_CREATE_PORT, port); + err = snd_seq_kernel_client_ctl(sysclient, SNDRV_SEQ_IOCTL_CREATE_PORT, + port); + if (err < 0) + goto error_port; /* register announcement port */ strcpy(port->name, "Announce"); @@ -158,16 +162,24 @@ int __init snd_seq_system_client_init(void) port->flags = SNDRV_SEQ_PORT_FLG_GIVEN_PORT; port->addr.client = sysclient; port->addr.port = SNDRV_SEQ_PORT_SYSTEM_ANNOUNCE; - snd_seq_kernel_client_ctl(sysclient, SNDRV_SEQ_IOCTL_CREATE_PORT, port); + err = snd_seq_kernel_client_ctl(sysclient, SNDRV_SEQ_IOCTL_CREATE_PORT, + port); + if (err < 0) + goto error_port; announce_port = port->addr.port; kfree(port); return 0; + + error_port: + snd_seq_system_client_done(); + kfree(port); + return err; } /* unregister our internal client */ -void __exit snd_seq_system_client_done(void) +void snd_seq_system_client_done(void) { int oldsysclient = sysclient; -- 2.18.0

1 0

[alsa-devel] [PATCH] [ALSA] seq: add error check in snd_seq_system_client_init()
by Dan Carpenter 28 Aug '18

28 Aug '18

Static checkers complain that snd_seq_create_kernel_client() can return -EBUSY here so we need to have some error handling. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/core/seq/seq_system.c b/sound/core/seq/seq_system.c index 8ce1d0b40dce..3b89b0adad6a 100644 --- a/sound/core/seq/seq_system.c +++ b/sound/core/seq/seq_system.c @@ -134,6 +134,10 @@ int __init snd_seq_system_client_init(void) /* register client */ sysclient = snd_seq_create_kernel_client(NULL, 0, "System"); + if (sysclient < 0) { + kfree(port); + return sysclient; + } /* register timer */ strcpy(port->name, "Timer");

2 1

[alsa-devel] i.Mx35 SGTL5000 - audio hangs only on system reboot.
by Nikhil 28 Aug '18

28 Aug '18

Hello, I am facing an issue with SGTL5000 codec which happens only on reboot. Below are the details. On doing a power cycle audio works fine, but if I do a "reboot", I could see that driver probe is success, but on playing a file using ogg, it hangs. At the moment, I am not sure where the issue is. I did some search in Freescale/NXP forums and found there are issues related to SGTL5000 and i2c bus on reboot, but in my case, on reboot the probe itself is success, so I believe , its not the I2c reboot issue. Any help as to how I can debug further or solutions is much appreciated. Thanks in advance. Regards Nikhil System details: chip : i.Mx35 Kernel : 4.14 linux-fslc DeviceTree : sound { compatible = "fsl,imx-audio-sgtl5000"; model = "ebox-sgtl5000"; ssi-controller = <&ssi1>; audio-codec = <&codec>; audio-routing = "MIC_IN", "Mic Jack", "Mic Jack", "Mic Bias", "Headphone Jack", "HP_OUT", "Ext Spk", "LINE_OUT"; mux-int-port = <1>; mux-ext-port = <4>; }; codec: sgtl5000@0a { compatible = "fsl,sgtl5000"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sgtl5000>; reg = <0x0a>; clocks = <&clks 86>; VDDA-supply = <&vcam_reg>; VDDIO-supply = <&reg_sgtl5000_vddd>; }; sgtl output: $ dmesg | grep sgtl [ 2.416167] sgtl5000 1-000a: sgtl5000 revision 0x11 [ 2.425204] sgtl5000 1-000a: Using internal LDO instead of VDDD: check ER1 [ 2.562911] imx-sgtl5000 sound: sgtl5000 <-> 43fa0000.ssi mapping ok [ 3.247742] #0: ebox-sgtl5000 dma output on reboot: $ dmesg | grep -i dma [ 0.049859] DMA: preallocated 256 KiB pool for atomic coherent allocations [ 0.710313] i2c i2c-1: can't use DMA, using PIO instead. [ 0.712794] i2c i2c-3: can't use DMA, using PIO instead. [ 0.818858] ipu-core ipu-core: private_candidate: dma0chan0 filter said false [ 0.818918] ipu-core ipu-core: private_candidate: dma0chan1 filter said false [ 0.818945] ipu-core ipu-core: private_candidate: dma0chan2 filter said false [ 0.818972] ipu-core ipu-core: private_candidate: dma0chan3 filter said false [ 0.818997] ipu-core ipu-core: private_candidate: dma0chan4 filter said false [ 0.819022] ipu-core ipu-core: private_candidate: dma0chan5 filter said false [ 0.819047] ipu-core ipu-core: private_candidate: dma0chan6 filter said false [ 0.819072] ipu-core ipu-core: private_candidate: dma0chan7 filter said false [ 0.819098] ipu-core ipu-core: private_candidate: dma0chan8 filter said false [ 0.819123] ipu-core ipu-core: private_candidate: dma0chan9 filter said false [ 0.819148] ipu-core ipu-core: private_candidate: dma0chan10 filter said false [ 0.819174] ipu-core ipu-core: private_candidate: dma0chan11 filter said false [ 0.819199] ipu-core ipu-core: private_candidate: dma0chan12 filter said false [ 0.819224] ipu-core ipu-core: private_candidate: dma0chan13 filter said false [ 0.961113] ipu-core ipu-core: IDMAC_CONF 0x70, IC_CONF 0x0, IDMAC_CHA_EN 0x0, IDMAC_CHA_PRI 0x0, IDMAC_CHA_BUSY 0x0 [ 0.961409] dma dma0chan14: Found channel 0xe, irq 176 [ 0.961442] dmaengine: __dma_request_channel: success (dma0chan14) [ 0.988705] dma dma0chan14: Submitting sg d79f3b94 [ 0.988776] dma dma0chan14: Updated sg d79f3b94 on channel 0xe buffer 0 [ 0.988827] ipu-core ipu-core: IDMAC_CONF 0x70, IC_CONF 0x0, IDMAC_CHA_EN 0x0, IDMAC_CHA_PRI 0x4000, IDMAC_CHA_BUSY 0x0 [ 0.988885] ipu-core ipu-core: IDMAC_CONF 0x70, IC_CONF 0x0, IDMAC_CHA_EN 0x4000, IDMAC_CHA_PRI 0x4000, IDMAC_CHA_BUSY 0x0 [ 1.084868] imx-sdma 53fd4000.sdma: no event needs to be remapped [ 1.085941] imx-sdma 53fd4000.sdma: loaded firmware 1.0 [ 1.934535] spi_imx 43fa4000.cspi: dma setup error -19, use pio [ 2.401179] mmc0: SDHCI controller on 53fb4000.esdhc [53fb4000.esdhc] using DMA [ 2.472063] dmaengine: __dma_request_channel: success (dma1chan0) [ 2.472236] imx-sdma 53fd4000.sdma: private_candidate: dma1chan0 busy [ 2.472374] dmaengine: __dma_request_channel: success (dma1chan1) sgtl5000 registers on reboot , but before playing sound file: $ cat /sys/kernel/debug/regmap/1-000a/registers 000: a011 002: 0060 004: 0008 006: 0080 00a: 0010 00e: 020c 010: 3c3c 014: 015f 020: 0000 022: 1818 024: 0022 026: 0008 028: 01c1 02a: 0200 02c: 031c 02e: 0f0f 030: 7a60 032: 5000 034: 0800 036: 0017 03a: 0000 03c: 0000 100: 0000 102: 0000 104: 8040 106: 051f 108: 0000 10a: 0040 10c: 0000 10e: 0000 110: 0000 116: 002f 118: 002f 11a: 002f 11c: 002f 11e: 002f 120: 8000 122: 0000 124: 5100 126: 1473 128: 0028 12a: 0050 12c: 0000 12e: 0000 130: 0000 132: 0000 134: 0000 136: 0000 138: 0000 13a: 0000 ssi registers on reboot , but before playing sound file: $ cat /sys/kernel/debug/regmap/43fa0000.ssi/registers 00: 00000000 04: 00000000 10: 00001058 18: 00003003 1c: 0000020d 20: 0000020d 24: 00040100 28: 00040100 2c: 00880088 30: 00001111 34: 00000000 38: 00000000 48: 00000000 4c: 00000000 50: 00000000 54: 00000000 58: 00000000 sgtl5000 registers on reboot , after playing sound file: $ cat /sys/kernel/debug/regmap/1-000a/registers 000: a011 002: 0061 004: 0007 006: 0090 00a: 0010 00e: 0200 010: 3c3c 014: 015f 020: 0000 022: 1818 024: 0022 026: 0008 028: 01c1 02a: 0200 02c: 031c 02e: 0f0f 030: 7ff9 032: 786c 034: 0808 036: 0017 03a: 0000 03c: 0000 100: 0000 102: 0000 104: 8040 106: 051f 108: 0000 10a: 0040 10c: 0000 10e: 0000 110: 0000 116: 002f 118: 002f 11a: 002f 11c: 002f 11e: 002f 120: 8000 122: 0000 124: 5100 126: 1473 128: 0028 12a: 0050 12c: 0000 12e: 0000 130: 0000 132: 0000 134: 0000 136: 0000 138: 0000 13a: 0000 ssi registers on reboot , after playing sound file: $ cat /sys/kernel/debug/regmap/43fa0000.ssi/registers 00: 00ffff00 04: 00000000 10: 0000105b 18: 01d035f7 1c: 0000028d 20: 0000028d 24: 00056100 28: 00040100 2c: 00880888 30: 00001111 34: 00000000 38: 00000000 48: 00000000 4c: 00000000 50: 00000000 54: 00000000 58: 00000000 dma output after playing a sound file: [ 115.626358] imx-sdma 53fd4000.sdma: load_address = 834 [ 115.626482] imx-sdma 53fd4000.sdma: wml = 0x00000020 [ 115.626512] imx-sdma 53fd4000.sdma: shp_addr = 0x43fa0000 [ 115.626537] imx-sdma 53fd4000.sdma: per_addr = 0x00000000 [ 115.626563] imx-sdma 53fd4000.sdma: event_mask0 = 0x20000000 [ 115.626588] imx-sdma 53fd4000.sdma: event_mask1 = 0x00000000 [ 116.072831] imx-sdma 53fd4000.sdma: sdma_prep_dma_cyclic channel: 1 [ 116.072956] imx-sdma 53fd4000.sdma: load_address = 834 [ 116.072984] imx-sdma 53fd4000.sdma: wml = 0x00000020 [ 116.073009] imx-sdma 53fd4000.sdma: shp_addr = 0x43fa0000 [ 116.073032] imx-sdma 53fd4000.sdma: per_addr = 0x00000000 [ 116.073055] imx-sdma 53fd4000.sdma: event_mask0 = 0x20000000 [ 116.073077] imx-sdma 53fd4000.sdma: event_mask1 = 0x00000000 [ 116.073160] imx-sdma 53fd4000.sdma: entry 0: count: 1768 dma: 0x97b80000 intr [ 116.073191] imx-sdma 53fd4000.sdma: entry 1: count: 1768 dma: 0x97b806e8 intr [ 116.073219] imx-sdma 53fd4000.sdma: entry 2: count: 1768 dma: 0x97b80dd0 intr [ 116.073247] imx-sdma 53fd4000.sdma: entry 3: count: 1768 dma: 0x97b814b8 wrap int

1 0

[alsa-devel] [PATCH] ASoC: Convert to using %pOFn instead of device_node.name
by Rob Herring 28 Aug '18

28 Aug '18

In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier. Cc: Timur Tabi <timur(a)kernel.org> Cc: Nicolin Chen <nicoleotsuka(a)gmail.com> Cc: Xiubo Li <Xiubo.Lee(a)gmail.com> Cc: Fabio Estevam <fabio.estevam(a)nxp.com> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Carlo Caione <carlo(a)caione.org> Cc: Kevin Hilman <khilman(a)baylibre.com> Cc: Olivier Moysan <olivier.moysan(a)st.com> Cc: Arnaud Pouliquen <arnaud.pouliquen(a)st.com> Cc: Maxime Coquelin <mcoquelin.stm32(a)gmail.com> Cc: Alexandre Torgue <alexandre.torgue(a)st.com> Cc: alsa-devel(a)alsa-project.org Cc: linuxppc-dev(a)lists.ozlabs.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-amlogic(a)lists.infradead.org Signed-off-by: Rob Herring <robh(a)kernel.org> --- sound/soc/fsl/fsl_esai.c | 2 +- sound/soc/fsl/fsl_utils.c | 4 ++-- sound/soc/meson/axg-card.c | 2 +- sound/soc/stm/stm32_sai.c | 2 +- sound/soc/stm/stm32_sai_sub.c | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index c1d1d06783e5..57b484768a58 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -807,7 +807,7 @@ static int fsl_esai_probe(struct platform_device *pdev) return -ENOMEM; esai_priv->pdev = pdev; - strncpy(esai_priv->name, np->name, sizeof(esai_priv->name) - 1); + snprintf(esai_priv->name, sizeof(esai_priv->name), "%pOFn", np); /* Get the addresses and IRQ */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); diff --git a/sound/soc/fsl/fsl_utils.c b/sound/soc/fsl/fsl_utils.c index 7f0fa4b52223..9981668ab590 100644 --- a/sound/soc/fsl/fsl_utils.c +++ b/sound/soc/fsl/fsl_utils.c @@ -57,8 +57,8 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np, of_node_put(dma_channel_np); return ret; } - snprintf((char *)dai->platform_name, DAI_NAME_SIZE, "%llx.%s", - (unsigned long long) res.start, dma_channel_np->name); + snprintf((char *)dai->platform_name, DAI_NAME_SIZE, "%llx.%pOFn", + (unsigned long long) res.start, dma_channel_np); iprop = of_get_property(dma_channel_np, "cell-index", NULL); if (!iprop) { diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index 2914ba0d965b..b76a5f4f1785 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -478,7 +478,7 @@ static int axg_card_set_be_link(struct snd_soc_card *card, ret = axg_card_set_link_name(card, link, "be"); if (ret) - dev_err(card->dev, "error setting %s link name\n", np->name); + dev_err(card->dev, "error setting %pOFn link name\n", np); return ret; } diff --git a/sound/soc/stm/stm32_sai.c b/sound/soc/stm/stm32_sai.c index f22654253c43..d597eba61992 100644 --- a/sound/soc/stm/stm32_sai.c +++ b/sound/soc/stm/stm32_sai.c @@ -104,7 +104,7 @@ static int stm32_sai_set_sync(struct stm32_sai_data *sai_client, if (!pdev) { dev_err(&sai_client->pdev->dev, - "Device not found for node %s\n", np_provider->name); + "Device not found for node %pOFn\n", np_provider); return -ENODEV; } diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index 06fba9650ac4..cad8c7888292 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -1124,16 +1124,16 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev, sai->sync = SAI_SYNC_NONE; if (args.np) { if (args.np == np) { - dev_err(&pdev->dev, "%s sync own reference\n", - np->name); + dev_err(&pdev->dev, "%pOFn sync own reference\n", + np); of_node_put(args.np); return -EINVAL; } sai->np_sync_provider = of_get_parent(args.np); if (!sai->np_sync_provider) { - dev_err(&pdev->dev, "%s parent node not found\n", - np->name); + dev_err(&pdev->dev, "%pOFn parent node not found\n", + np); of_node_put(args.np); return -ENODEV; } -- 2.17.1

2 1

[alsa-devel] [PATCH] sound: Convert to using %pOFn instead of device_node.name
by Rob Herring 28 Aug '18

28 Aug '18

In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier. Cc: Johannes Berg <johannes(a)sipsolutions.net> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: linuxppc-dev(a)lists.ozlabs.org Cc: alsa-devel(a)alsa-project.org Signed-off-by: Rob Herring <robh(a)kernel.org> --- sound/aoa/soundbus/i2sbus/core.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 000b58522106..bf32e1c74748 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c @@ -157,18 +157,19 @@ static int i2sbus_add_dev(struct macio_dev *macio, struct device_node *child = NULL, *sound = NULL; struct resource *r; int i, layout = 0, rlen, ok = force; - static const char *rnames[] = { "i2sbus: %s (control)", - "i2sbus: %s (tx)", - "i2sbus: %s (rx)" }; + char node_name[6]; + static const char *rnames[] = { "i2sbus: %pOFn (control)", + "i2sbus: %pOFn (tx)", + "i2sbus: %pOFn (rx)" }; static irq_handler_t ints[] = { i2sbus_bus_intr, i2sbus_tx_intr, i2sbus_rx_intr }; - if (strlen(np->name) != 5) + if (snprintf(node_name, sizeof(node_name), "%pOFn", np) != 5) return 0; - if (strncmp(np->name, "i2s-", 4)) + if (strncmp(np, "i2s-", 4)) return 0; dev = kzalloc(sizeof(struct i2sbus_dev), GFP_KERNEL); @@ -228,13 +229,13 @@ static int i2sbus_add_dev(struct macio_dev *macio, dev->sound.pcmid = -1; dev->macio = macio; dev->control = control; - dev->bus_number = np->name[4] - 'a'; + dev->bus_number = node_name[4] - 'a'; INIT_LIST_HEAD(&dev->sound.codec_list); for (i = aoa_resource_i2smmio; i <= aoa_resource_rxdbdma; i++) { dev->interrupts[i] = -1; snprintf(dev->rnames[i], sizeof(dev->rnames[i]), - rnames[i], np->name); + rnames[i], np); } for (i = aoa_resource_i2smmio; i <= aoa_resource_rxdbdma; i++) { int irq = irq_of_parse_and_map(np, i); -- 2.17.1

2 1

[alsa-devel] [PATCH 1/3] ASoC: cs4265: SOC_SINGLE register value error fix
by Matt Flax 28 Aug '18

28 Aug '18

From: Matt Flax <flatmax(a)flatmax.org> The cs4265 driver declares the "MMTLR Data Switch" register setting with a 0 register value rather then the 0x12 register (CS4265_SPDIF_CTL2). This incorrect value causes alsamixer to fault with the output : cannot load mixer controls: Input/output error This patch corrects the register value. alsamixer now runs. Signed-off-by: Matt Flax <flatmax(a)flatmax.org> --- sound/soc/codecs/cs4265.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/codecs/cs4265.c b/sound/soc/codecs/cs4265.c index 275677de..15b4ae04 100644 --- a/sound/soc/codecs/cs4265.c +++ b/sound/soc/codecs/cs4265.c @@ -157,8 +157,7 @@ static const struct snd_kcontrol_new cs4265_snd_controls[] = { SOC_SINGLE("Validity Bit Control Switch", CS4265_SPDIF_CTL2, 3, 1, 0), SOC_ENUM("SPDIF Mono/Stereo", spdif_mono_stereo_enum), - SOC_SINGLE("MMTLR Data Switch", 0, - 1, 1, 0), + SOC_SINGLE("MMTLR Data Switch", CS4265_SPDIF_CTL2, 0, 1, 0), SOC_ENUM("Mono Channel Select", spdif_mono_select_enum), SND_SOC_BYTES("C Data Buffer", CS4265_C_DATA_BUFF, 24), }; -- 2.17.1

2 3

Re: [alsa-devel] INFO: rcu detected stall in snd_seq_write
by Dmitry Vyukov 27 Aug '18

27 Aug '18

On Mon, Aug 27, 2018 at 10:10 AM, syzbot <syzbot+97aae04ce27e39cbfca9(a)syzkaller.appspotmail.com> wrote: > Hello, > > syzbot found the following crash on: > > HEAD commit: e27bc174c9c6 Add linux-next specific files for 20180824 > git tree: linux-next > console output: https://syzkaller.appspot.com/x/log.txt?x=16e0823e400000 > kernel config: https://syzkaller.appspot.com/x/.config?x=28446088176757ea > dashboard link: https://syzkaller.appspot.com/bug?extid=97aae04ce27e39cbfca9 > compiler: gcc (GCC) 8.0.1 20180413 (experimental) > syz repro: https://syzkaller.appspot.com/x/repro.syz?x=1756c50e400000 This seems to have been attributed to some x86 file, I will take a look as to why. +ALSA maintainers > IMPORTANT: if you fix the bug, please add the following tag to the commit: > Reported-by: syzbot+97aae04ce27e39cbfca9(a)syzkaller.appspotmail.com > > 8021q: adding VLAN 0 to HW filter on device team0 > 8021q: adding VLAN 0 to HW filter on device team0 > 8021q: adding VLAN 0 to HW filter on device team0 > 8021q: adding VLAN 0 to HW filter on device team0 > 8021q: adding VLAN 0 to HW filter on device team0 > rcu: INFO: rcu_sched self-detected stall on CPU > rcu: 0-....: (105000 ticks this GP) idle=2f6/1/0x4000000000000002 > softirq=23001/23001 fqs=26239 > rcu: (t=105008 jiffies g=49145 q=2382) > NMI backtrace for cpu 0 > CPU: 0 PID: 8551 Comm: syz-executor7 Not tainted 4.18.0-next-20180824+ #47 > Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS > Google 01/01/2011 > Call Trace: > <IRQ> > __dump_stack lib/dump_stack.c:77 [inline] > dump_stack+0x1c9/0x2b4 lib/dump_stack.c:113 > nmi_cpu_backtrace.cold.3+0x48/0x88 lib/nmi_backtrace.c:101 > nmi_trigger_cpumask_backtrace+0x151/0x192 lib/nmi_backtrace.c:62 > arch_trigger_cpumask_backtrace+0x14/0x20 arch/x86/kernel/apic/hw_nmi.c:38 > trigger_single_cpu_backtrace include/linux/nmi.h:162 [inline] > rcu_dump_cpu_stacks+0x175/0x1c2 kernel/rcu/tree.c:1340 > print_cpu_stall.cold.78+0x2fb/0x59c kernel/rcu/tree.c:1478 > check_cpu_stall kernel/rcu/tree.c:1550 [inline] > __rcu_pending kernel/rcu/tree.c:3276 [inline] > rcu_pending kernel/rcu/tree.c:3319 [inline] > rcu_check_callbacks+0xd4a/0x15a0 kernel/rcu/tree.c:2665 > update_process_times+0x2d/0x70 kernel/time/timer.c:1636 > tick_sched_handle+0x9f/0x180 kernel/time/tick-sched.c:164 > tick_sched_timer+0x45/0x130 kernel/time/tick-sched.c:1274 > __run_hrtimer kernel/time/hrtimer.c:1398 [inline] > __hrtimer_run_queues+0x3eb/0xff0 kernel/time/hrtimer.c:1460 > hrtimer_interrupt+0x2f3/0x750 kernel/time/hrtimer.c:1518 > local_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1029 [inline] > smp_apic_timer_interrupt+0x16d/0x6a0 arch/x86/kernel/apic/apic.c:1054 > apic_timer_interrupt+0xf/0x20 arch/x86/entry/entry_64.S:867 > </IRQ> > RIP: 0010:lock_release+0xa2/0x9f0 kernel/locking/lockdep.c:3910 > Code: f2 c7 40 08 f2 f2 f2 f2 c7 40 0c 00 f2 f2 f2 c7 40 10 f2 f2 f2 f2 c7 > 40 14 00 f2 f2 f2 65 48 8b 04 25 28 00 00 00 48 89 45 d0 <31> c0 48 89 f8 48 > c1 e8 03 0f b6 14 10 48 89 f8 83 e0 07 83 c0 03 > RSP: 0018:ffff8801aa0078c8 EFLAGS: 00000292 ORIG_RAX: ffffffffffffff13 > RAX: 2ec5cd2493d34200 RBX: 1ffff10035400f1e RCX: 0000000000000000 > RDX: dffffc0000000000 RSI: 0000000000000000 RDI: ffff8801a9b56bbc > RBP: ffff8801aa0079f8 R08: 00000000000010df R09: 0000000000000001 > R10: ffff8801a9b56be8 R11: 737c3e5c87308161 R12: ffff8801aa0079d0 > R13: ffff8801c778d4c8 R14: ffff8801aa007ae0 R15: ffff8801a9b56380 > __might_fault+0x19e/0x1e0 mm/memory.c:4585 > _copy_from_user+0x30/0x150 lib/usercopy.c:10 > copy_from_user include/linux/uaccess.h:147 [inline] > snd_seq_write+0x472/0x8d0 sound/core/seq/seq_clientmgr.c:1033 > __vfs_write+0x117/0x9d0 fs/read_write.c:485 > vfs_write+0x1fc/0x560 fs/read_write.c:549 > ksys_write+0x101/0x260 fs/read_write.c:598 > __do_sys_write fs/read_write.c:610 [inline] > __se_sys_write fs/read_write.c:607 [inline] > __x64_sys_write+0x73/0xb0 fs/read_write.c:607 > do_syscall_64+0x1b9/0x820 arch/x86/entry/common.c:290 > entry_SYSCALL_64_after_hwframe+0x49/0xbe > RIP: 0033:0x457089 > Code: fd b4 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7 > 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff > 0f 83 cb b4 fb ff c3 66 2e 0f 1f 84 00 00 00 00 > RSP: 002b:00007f09af65dc78 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 > RAX: ffffffffffffffda RBX: 00007f09af65e6d4 RCX: 0000000000457089 > RDX: 00000000ffffff76 RSI: 0000000020000000 RDI: 0000000000000003 > RBP: 00000000009300a0 R08: 0000000000000000 R09: 0000000000000000 > R10: 0000000000000000 R11: 0000000000000246 R12: 00000000ffffffff > R13: 00000000004d78a8 R14: 00000000004ca886 R15: 0000000000000000 > > > --- > This bug is generated by a bot. It may contain errors. > See https://goo.gl/tpsmEJ for more information about syzbot. > syzbot engineers can be reached at syzkaller(a)googlegroups.com. > > syzbot will keep track of this bug report. See: > https://goo.gl/tpsmEJ#bug-status-tracking for how to communicate with > syzbot. > syzbot can test patches for this bug, for details see: > https://goo.gl/tpsmEJ#testing-patches > > -- > You received this message because you are subscribed to the Google Groups > "syzkaller-bugs" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to syzkaller-bugs+unsubscribe(a)googlegroups.com. > To view this discussion on the web visit > https://groups.google.com/d/msgid/syzkaller-bugs/000000000000e5050205746dcb…. > For more options, visit https://groups.google.com/d/optout.

1 0