ASoC: PXA: Fix oops in __pxa2xx_pcm_prepare
Subsystems (3)
PATCH 1/1 ASoC: PXA: Fix oops in __pxa2xx_pcm_prepare
pxa2xx_pcm_hw_free frees dma channel and sets prtd->dma_ch to -1, but does not set prtd->params to NULL, so if pxa2xx_pcm_hw_params will be called immediately, it leaves prtd->dma_ch initialized with -1, and it results in oops in __pxa2xx_pcm_prepare. This bug is triggered via SDL.
This patch adds check for prtd->dma_ch to __pxa2xx_pcm_prepare and cleans prtd->params, so now it works properly.
--- sound/arm/pxa2xx-pcm-lib.c | 3 +++ sound/soc/pxa/pxa2xx-pcm.c | 1 + 2 files changed, 4 insertions(+), 0 deletions(-)
sound/arm/pxa2xx-pcm-lib.c +3 -0
@@ -140,6 +140,9 @@ int __pxa2xx_pcm_prepare(struct snd_pcm_substream *substream)if (!prtd || !prtd->params)return 0 ; +if (prtd->dma_ch ==-1 ) +return -EIO ; +DCSR (prtd->dma_ch) &= ~DCSR_RUN ;DCSR (prtd->dma_ch) =0 ;DCMD (prtd->dma_ch) =0 ;
sound/soc/pxa/pxa2xx-pcm.c +1 -0
@@ -65,6 +65,7 @@ static int pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream)if (prtd->dma_ch >=0 ) {pxa_free_dma (prtd->dma_ch); prtd->dma_ch =-1 ; + prtd->params =NULL ; }return 0 ;
Signature · 1 line
1.7.4.1
PATCH v2 1/1 ASoC: PXA: Fix oops in __pxa2xx_pcm_prepare
pxa2xx_pcm_hw_free frees dma channel and sets prtd->dma_ch to -1, but does not set prtd->params to NULL, so if pxa2xx_pcm_hw_params will be called immediately, it leaves prtd->dma_ch initialized with -1, and it results in oops in __pxa2xx_pcm_prepare. This bug is triggered via SDL.
This patch adds check for prtd->dma_ch to __pxa2xx_pcm_prepare and cleans prtd->params, so now it works properly.
---
v2: use -EINVAL as error in __pxa2xx_pcm_prepare if dma_ch is invalid.
sound/arm/pxa2xx-pcm-lib.c | 3 +++ sound/soc/pxa/pxa2xx-pcm.c | 1 + 2 files changed, 4 insertions(+), 0 deletions(-)
sound/arm/pxa2xx-pcm-lib.c +3 -0
@@ -140,6 +140,9 @@ int __pxa2xx_pcm_prepare(struct snd_pcm_substream *substream)if (!prtd || !prtd->params)return 0 ; +if (prtd->dma_ch ==-1 ) +return -EINVAL ; +DCSR (prtd->dma_ch) &= ~DCSR_RUN ;DCSR (prtd->dma_ch) =0 ;DCMD (prtd->dma_ch) =0 ;
sound/soc/pxa/pxa2xx-pcm.c +1 -0
@@ -65,6 +65,7 @@ static int pxa2xx_pcm_hw_free(struct snd_pcm_substream *substream)if (prtd->dma_ch >=0 ) {pxa_free_dma (prtd->dma_ch); prtd->dma_ch =-1 ; + prtd->params =NULL ; }return 0 ;
Signature · 1 line
1.7.4.1
Mark Brown
AppliedQuoted 8 lines · Vasily Khoruzhick
pxa2xx_pcm_hw_freefrees dma channel and setsprtd->dma_chto -1, but does not setprtd->paramsto NULL, so ifpxa2xx_pcm_hw_paramswill be called immediately, it leavesprtd->dma_chinitialized with -1, and it results in oops in__pxa2xx_pcm_prepare. This bug is triggered via SDL.This patch adds check for
prtd->dma_chto__pxa2xx_pcm_prepareand cleansprtd->params, so now it works properly.
Applied, thanks.