ASoC : cs4265 : readable register too low
Subsystems (5)
Sasha Levin
maintainerPATCH 3/11 spi: bitbang: Fix NULL pointer dereference in spi_unregister_master
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 5caaf29af5ca82d5da8bc1d0ad07d9e664ccf1d8 ]
If spi_register_master fails in spi_bitbang_start because device_add failure, We should return the error code other than 0, otherwise calling spi_bitbang_stop may trigger NULL pointer dereference like this:
BUG: KASAN: null-ptr-deref in __list_del_entry_valid+0x45/0xd0 Read of size 8 at addr 0000000000000000 by task syz-executor.0/3661 CPU: 0 PID: 3661 Comm: syz-executor.0 Not tainted 5.1.0+ #28 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014 Call Trace: dump_stack+0xa9/0x10e ? __list_del_entry_valid+0x45/0xd0 ? __list_del_entry_valid+0x45/0xd0 __kasan_report+0x171/0x18d ? __list_del_entry_valid+0x45/0xd0 kasan_report+0xe/0x20 __list_del_entry_valid+0x45/0xd0 spi_unregister_controller+0x99/0x1b0 spi_lm70llp_attach+0x3ae/0x4b0 [spi_lm70llp] ? 0xffffffffc1128000 ? klist_next+0x131/0x1e0 ? driver_detach+0x40/0x40 [parport] port_check+0x3b/0x50 [parport] bus_for_each_dev+0x115/0x180 ? subsys_dev_iter_exit+0x20/0x20 __parport_register_driver+0x1f0/0x210 [parport] ? 0xffffffffc1150000 do_one_initcall+0xb9/0x3b5 ? perf_trace_initcall_level+0x270/0x270 ? kasan_unpoison_shadow+0x30/0x40 ? kasan_unpoison_shadow+0x30/0x40 do_init_module+0xe0/0x330 load_module+0x38eb/0x4270 ? module_frob_arch_sections+0x20/0x20 ? kernel_read_file+0x188/0x3f0 ? find_held_lock+0x6d/0xd0 ? fput_many+0x1a/0xe0 ? __do_sys_finit_module+0x162/0x190 __do_sys_finit_module+0x162/0x190 ? __ia32_sys_init_module+0x40/0x40 ? __mutex_unlock_slowpath+0xb4/0x3f0 ? wait_for_completion+0x240/0x240 ? vfs_write+0x160/0x2a0 ? lockdep_hardirqs_off+0xb5/0x100 ? mark_held_locks+0x1a/0x90 ? do_syscall_64+0x14/0x2a0 do_syscall_64+0x72/0x2a0 entry_SYSCALL_64_after_hwframe+0x49/0xbe
--- drivers/spi/spi-bitbang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-bitbang.c +1 -1
@@ -392,7 +392,7 @@ int spi_bitbang_start(struct spi_bitbang *bitbang)if (ret)spi_master_put (master); -return 0 ; +return ret; }EXPORT_SYMBOL_GPL (spi_bitbang_start);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/11 scsi: hpsa: correct ioaccel2 chaining
In reply to Sasha LevinFrom: Don Brace <[email protected]>
[ Upstream commit 625d7d3518875c4d303c652a198feaa13d9f52d9 ]
- set ioaccel2_sg_element member 'chain_indicator' to IOACCEL2_LAST_SG for the last s/g element.
- set ioaccel2_sg_element member 'chain_indicator' to IOACCEL2_CHAIN when chaining.
--- drivers/scsi/hpsa.c | 7 ++++++- drivers/scsi/hpsa_cmd.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/scsi/hpsa.c +6 -1
@@ -4815,7 +4815,7 @@ static int hpsa_scsi_ioaccel2_queue_command(struct ctlr_info *h, curr_sg->reserved[0 ] =0 ; curr_sg->reserved[1 ] =0 ; curr_sg->reserved[2 ] =0 ; - curr_sg->chain_indicator =0x80 ; + curr_sg->chain_indicator =IOACCEL2_CHAIN ; curr_sg = h->ioaccel2_cmd_sg_list[c->cmdindex]; }
@@ -4832,6 +4832,11 @@ static int hpsa_scsi_ioaccel2_queue_command(struct ctlr_info *h, curr_sg++; } +/* +* Set the last s/g element bit +*/ + (curr_sg -1 )->chain_indicator =IOACCEL2_LAST_SG ; +switch (cmd->sc_data_direction) {case DMA_TO_DEVICE : cp->direction &= ~IOACCEL2_DIRECTION_MASK ;
drivers/scsi/hpsa_cmd.h +1 -0
@@ -516,6 +516,7 @@ struct ioaccel2_sg_element {u8 reserved[3 ];u8 chain_indicator;#define IOACCEL2_CHAIN 0x80 +#define IOACCEL2_LAST_SG 0x40 };/*
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/11 ASoC: soc-pcm: BE dai needs prepare when pause release after resume
In reply to Sasha LevinFrom: Libin Yang <[email protected]>
[ Upstream commit 5087a8f17df868601cd7568299e91c28086d2b45 ]
If playback/capture is paused and system enters S3, after system returns from suspend, BE dai needs to call prepare() callback when playback/capture is released from pause if RESUME_INFO flag is not set.
Currently, the dpcm_be_dai_prepare() function will block calling prepare() if the pcm is in SND_SOC_DPCM_STATE_PAUSED state. This will cause the following test case fail if the pcm uses BE:
playback -> pause -> S3 suspend -> S3 resume -> pause release
The playback may exit abnormally when pause is released because the BE dai prepare() is not called.
This patch allows dpcm_be_dai_prepare() to call dai prepare() callback in SND_SOC_DPCM_STATE_PAUSED state.
--- sound/soc/soc-pcm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/soc-pcm.c +2 -1
@@ -2247,7 +2247,8 @@ int dpcm_be_dai_prepare(struct snd_soc_pcm_runtime *fe, int stream)if ((be->dpcm[stream].state !=SND_SOC_DPCM_STATE_HW_PARAMS ) && (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_STOP ) && - (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_SUSPEND )) + (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_SUSPEND ) && + (be->dpcm[stream].state !=SND_SOC_DPCM_STATE_PAUSED ))continue ; dev_dbg(be->dev, "ASoC: prepare BE %s\n",
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 5/11 drm/mediatek: fix unbind functions
In reply to Sasha LevinFrom: Hsin-Yi Wang <[email protected]>
[ Upstream commit 8fd7a37b191f93737f6280a9b5de65f98acc12c9 ]
detatch panel in mtk_dsi_destroy_conn_enc(), since .bind will try to attach it again.
--- drivers/gpu/drm/mediatek/mtk_dsi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/mediatek/mtk_dsi.c +2 -0
@@ -720,6 +720,8 @@ static void mtk_dsi_destroy_conn_enc(struct mtk_dsi *dsi)/* Skip connector cleanup if creation was delegated to the bridge */ if (dsi->conn.dev)drm_connector_cleanup (&dsi->conn); +if (dsi->panel) +drm_panel_detach (dsi->panel); }static void mtk_dsi_ddp_start (struct mtk_ddp_comp *comp)
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 6/11 ASoC: max98090: remove 24-bit format support if RJ is 0
In reply to Sasha LevinFrom: Yu-Hsuan Hsu <[email protected]>
[ Upstream commit 5628c8979642a076f91ee86c3bae5ad251639af0 ]
The supported formats are S16_LE and S24_LE now. However, by datasheet of max98090, S24_LE is only supported when it is in the right justified mode. We should remove 24-bit format if it is not in that mode to avoid triggering error.
--- sound/soc/codecs/max98090.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
sound/soc/codecs/max98090.c +16 -0
@@ -1924,6 +1924,21 @@ static int max98090_configure_dmic(struct max98090_priv *max98090,return 0 ; } +static int max98090_dai_startup (struct snd_pcm_substream *substream, +struct snd_soc_dai *dai) +{ +struct snd_soc_component *component = dai->component; +struct max98090_priv *max98090 =snd_soc_component_get_drvdata (component); +unsigned int fmt = max98090->dai_fmt; + +/* Remove 24-bit format support if it is not in right justified mode. */ +if ((fmt &SND_SOC_DAIFMT_FORMAT_MASK ) !=SND_SOC_DAIFMT_RIGHT_J ) { + substream->runtime->hw.formats =SNDRV_PCM_FMTBIT_S16_LE ; +snd_pcm_hw_constraint_msbits (substream->runtime,0 ,16 ,16 ); + } +return 0 ; +} +static int max98090_dai_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *params,struct snd_soc_dai *dai)
@@ -2331,6 +2346,7 @@ EXPORT_SYMBOL_GPL(max98090_mic_detect);#define MAX98090_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE)static const struct snd_soc_dai_ops max98090_dai_ops = { + .startup = max98090_dai_startup, .set_sysclk = max98090_dai_set_sysclk, .set_fmt = max98090_dai_set_fmt, .set_tdm_slot = max98090_set_tdm_slot,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/11 ASoC: sun4i-codec: fix first delay on Speaker
In reply to Sasha LevinFrom: Georgii Staroselskii <[email protected]>
[ Upstream commit 1f2675f6655838aaf910f911fd0abc821e3ff3df ]
Allwinner DAC seems to have a delay in the Speaker audio routing. When playing a sound for the first time, the sound gets chopped. On a second play the sound is played correctly. After some time (~5s) the issue gets back.
This commit seems to be fixing the same issue as bf14da7 but for another codepath.
This is the DTS that was used to debug the problem.
&codec {
allwinner,pa-gpios = <&r_pio 0 11 GPIO_ACTIVE_HIGH>; /* PL11 */
allwinner,audio-routing =
"Speaker", "LINEOUT";
status = "okay";
}--- sound/soc/sunxi/sun4i-codec.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/soc/sunxi/sun4i-codec.c +9 -0
@@ -747,6 +747,15 @@ static int sun4i_codec_spk_event(struct snd_soc_dapm_widget *w,gpiod_set_value_cansleep (scodec->gpio_pa, !!SND_SOC_DAPM_EVENT_ON (event)); +if (SND_SOC_DAPM_EVENT_ON (event)) { +/* +* Need a delay to wait for DAC to push the data. 700ms seems +* to be the best compromise not to feel this delay while +* playing a sound. +*/ +msleep (700 ); + } +return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/11 usb: gadget: fusb300_udc: Fix memory leak of fusb300->ep[i]
In reply to Sasha LevinFrom: Young Xiao <[email protected]>
[ Upstream commit 62fd0e0a24abeebe2c19fce49dd5716d9b62042d ]
There is no deallocation of fusb300->ep[i] elements, allocated at fusb300_probe.
The patch adds deallocation of fusb300->ep array elements.
--- drivers/usb/gadget/udc/fusb300_udc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/gadget/udc/fusb300_udc.c +5 -0
@@ -1345,12 +1345,15 @@ static const struct usb_gadget_ops fusb300_gadget_ops = {static int fusb300_remove (struct platform_device *pdev) {struct fusb300 *fusb300 =platform_get_drvdata (pdev); +int i;usb_del_gadget_udc (&fusb300->gadget);iounmap (fusb300->reg);free_irq (platform_get_irq (pdev,0 ), fusb300);fusb300_free_request (&fusb300->ep[0 ]->ep, fusb300->ep0_req); +for (i =0 ; i <FUSB300_MAX_NUM_EP ; i++) +kfree (fusb300->ep[i]);kfree (fusb300);return 0 ;
@@ -1494,6 +1497,8 @@ static int fusb300_probe(struct platform_device *pdev)if (fusb300->ep0_req)fusb300_free_request (&fusb300->ep[0 ]->ep, fusb300->ep0_req); +for (i =0 ; i <FUSB300_MAX_NUM_EP ; i++) +kfree (fusb300->ep[i]);kfree (fusb300); }if (reg)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/11 usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC
In reply to Sasha LevinFrom: Alexandre Belloni <[email protected]>
[ Upstream commit fbc318afadd6e7ae2252d6158cf7d0c5a2132f7d ]
Gadget drivers may queue request in interrupt context. This would lead to a descriptor allocation in that context. In that case we would hit BUG_ON(in_interrupt()) in __get_vm_area_node.
Also remove the unnecessary cast.
--- drivers/usb/gadget/udc/lpc32xx_udc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/gadget/udc/lpc32xx_udc.c +1 -2
@@ -935,8 +935,7 @@ static struct lpc32xx_usbd_dd_gad *udc_dd_alloc(struct lpc32xx_udc *udc)dma_addr_t dma;struct lpc32xx_usbd_dd_gad *dd; - dd = (struct lpc32xx_usbd_dd_gad *)dma_pool_alloc ( - udc->dd_cache, (GFP_KERNEL |GFP_DMA ), &dma); + dd =dma_pool_alloc (udc->dd_cache,GFP_ATOMIC |GFP_DMA , &dma);if (dd) dd->this_dma = dma;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 10/11 scripts/decode_stacktrace.sh: prefix addr2line with $CROSS_COMPILE
In reply to Sasha LevinFrom: Manuel Traut <[email protected]>
[ Upstream commit c04e32e911653442fc834be6e92e072aeebe01a1 ]
At least for ARM64 kernels compiled with the crosstoolchain from Debian/stretch or with the toolchain from kernel.org the line number is not decoded correctly by 'decode_stacktrace.sh':
$ echo "[ 136.513051] f1+0x0/0xc [kcrash]" | \
CROSS_COMPILE=/opt/gcc-8.1.0-nolibc/aarch64-linux/bin/aarch64-linux- \
./scripts/decode_stacktrace.sh /scratch/linux-arm64/vmlinux \
/scratch/linux-arm64 \
/nfs/debian/lib/modules/4.20.0-devel
[ 136.513051] f1 (/linux/drivers/staging/kcrash/kcrash.c:68) kcrashIf addr2line from the toolchain is used the decoded line number is correct:
[ 136.513051] f1 (/linux/drivers/staging/kcrash/kcrash.c:57) kcrash
--- scripts/decode_stacktrace.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/decode_stacktrace.sh +1 -1
@@ -65,7 +65,7 @@ parse_symbol() { if [[ "${cache[$module,$address]+isset}" == "isset" ]]; then local code=${cache[$module,$address]} else - local code=$(addr2line -i -e "$objfile" "$address") + local code=$(${CROSS_COMPILE}addr2line -i -e "$objfile" "$address") cache[$module,$address]=$code fi
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/11 mm/mlock.c: change count_mm_mlocked_page_nr return type
In reply to Sasha LevinFrom: swkhack <[email protected]>
[ Upstream commit 0874bb49bb21bf24deda853e8bf61b8325e24bcb ]
On a 64-bit machine the value of "vma->vm_end - vma->vm_start" may be negative when using 32 bit ints and the "count >> PAGE_SHIFT"'s result will be wrong. So change the local variable and return value to unsigned long to fix the problem.
--- mm/mlock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/mlock.c +2 -2
@@ -630,11 +630,11 @@ static int apply_vma_lock_flags(unsigned long start, size_t len,* is also counted. * Return value: previously mlocked page counts */ -static int count_mm_mlocked_page_nr (struct mm_struct *mm, +static unsigned long count_mm_mlocked_page_nr (struct mm_struct *mm,unsigned long start,size_t len) {struct vm_area_struct *vma; -int count =0 ; +unsigned long count =0 ;if (mm ==NULL ) mm = current->mm;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 1/11 ASoC : cs4265 : readable register too low
From: Matt Flax <[email protected]>
[ Upstream commit f3df05c805983427319eddc2411a2105ee1757cf ]
The cs4265_readable_register function stopped short of the maximum register.
An example bug is taken from :
https://github.com/Audio-Injector/Ultra/issues/25
Where alsactl store fails with :
Cannot read control '2,0,0,C Data Buffer,0': Input/output error
This patch fixes the bug by setting the cs4265 to have readable registers up to the maximum hardware register CS4265_MAX_REGISTER.
--- sound/soc/codecs/cs4265.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/cs4265.c +1 -1
@@ -60,7 +60,7 @@ static const struct reg_default cs4265_reg_defaults[] = {static bool cs4265_readable_register (struct device *dev,unsigned int reg) {switch (reg) { - case CS4265_CHIP_ID ... CS4265_SPDIF_CTL2: + case CS4265_CHIP_ID ... CS4265_MAX_REGISTER:return true;default :return false;
Signature · 1 line
2.20.1