Commit c9bd5e69 authored by Russell King's avatar Russell King
Browse files

DMA-API: sound: fix dma mask handling in a lot of drivers 



This code sequence is unsafe in modules:

static u64 mask = DMA_BIT_MASK(something);
...
	if (!dev->dma_mask)
		dev->dma_mask = &mask;

as if a module is reloaded, the mask will be pointing at the original
module's mask address, and this can lead to oopses.  Moreover, they
all follow this with:

	if (!dev->coherent_dma_mask)
		dev->coherent_dma_mask = mask;

where 'mask' is the same value as the statically defined mask, and this
bypasses the architecture's check on whether the DMA mask is possible.

Fix these issues by using the new dma_coerce_coherent_and_mask()
function.

Acked-by: default avatarMark Brown <broonie@linaro.org>
Acked-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent fa6a8d6d

sound/arm/pxa2xx-pcm.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */

 */





#include <linux/module.h>

#include <linux/module.h>

#include <linux/dma-mapping.h>

#include <linux/dmaengine.h>

#include <linux/dmaengine.h>





#include <sound/core.h>

#include <sound/core.h>
@@ -83,8 +84,6 @@ static struct snd_pcm_ops pxa2xx_pcm_ops = { 
	.mmap		= pxa2xx_pcm_mmap,

	.mmap		= pxa2xx_pcm_mmap,

};

};





static u64 pxa2xx_pcm_dmamask = 0xffffffff;



int pxa2xx_pcm_new(struct snd_card *card, struct pxa2xx_pcm_client *client,

int pxa2xx_pcm_new(struct snd_card *card, struct pxa2xx_pcm_client *client,

		   struct snd_pcm **rpcm)

		   struct snd_pcm **rpcm)

{

{
@@ -100,10 +99,9 @@ int pxa2xx_pcm_new(struct snd_card *card, struct pxa2xx_pcm_client *client, 
	pcm->private_data = client;

	pcm->private_data = client;

	pcm->private_free = pxa2xx_pcm_free_dma_buffers;

	pcm->private_free = pxa2xx_pcm_free_dma_buffers;





	if (!card->dev->dma_mask)

	ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32));

		card->dev->dma_mask = &pxa2xx_pcm_dmamask;

	if (ret)

	if (!card->dev->coherent_dma_mask)

		goto out;

		card->dev->coherent_dma_mask = 0xffffffff;





	if (play) {

	if (play) {

		int stream = SNDRV_PCM_STREAM_PLAYBACK;

		int stream = SNDRV_PCM_STREAM_PLAYBACK;

sound/soc/atmel/atmel-pcm.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -68,18 +68,15 @@ int atmel_pcm_mmap(struct snd_pcm_substream *substream, 
}

}

EXPORT_SYMBOL_GPL(atmel_pcm_mmap);

EXPORT_SYMBOL_GPL(atmel_pcm_mmap);





static u64 atmel_pcm_dmamask = DMA_BIT_MASK(32);



int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd)

int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd)

{

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_card *card = rtd->card->snd_card;

	struct snd_pcm *pcm = rtd->pcm;

	struct snd_pcm *pcm = rtd->pcm;

	int ret = 0;

	int ret;





	if (!card->dev->dma_mask)

	ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32));

		card->dev->dma_mask = &atmel_pcm_dmamask;

	if (ret)

	if (!card->dev->coherent_dma_mask)

		return ret;

		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);





	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		pr_debug("atmel-pcm: allocating PCM playback DMA buffer\n");

		pr_debug("atmel-pcm: allocating PCM playback DMA buffer\n");

sound/soc/blackfin/bf5xx-ac97-pcm.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -415,19 +415,16 @@ static void bf5xx_pcm_free_dma_buffers(struct snd_pcm *pcm) 
	}

	}

}

}





static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);



static int bf5xx_pcm_ac97_new(struct snd_soc_pcm_runtime *rtd)

static int bf5xx_pcm_ac97_new(struct snd_soc_pcm_runtime *rtd)

{

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_card *card = rtd->card->snd_card;

	struct snd_pcm *pcm = rtd->pcm;

	struct snd_pcm *pcm = rtd->pcm;

	int ret = 0;

	int ret;





	pr_debug("%s enter\n", __func__);

	pr_debug("%s enter\n", __func__);

	if (!card->dev->dma_mask)

	ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32));

		card->dev->dma_mask = &bf5xx_pcm_dmamask;

	if (ret)

	if (!card->dev->coherent_dma_mask)

		return ret;

		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);





	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		ret = bf5xx_pcm_preallocate_dma_buffer(pcm,

		ret = bf5xx_pcm_preallocate_dma_buffer(pcm,

sound/soc/blackfin/bf5xx-i2s-pcm.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -323,18 +323,16 @@ static struct snd_pcm_ops bf5xx_pcm_i2s_ops = { 
	.silence	= bf5xx_pcm_silence,

	.silence	= bf5xx_pcm_silence,

};

};





static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);



static int bf5xx_pcm_i2s_new(struct snd_soc_pcm_runtime *rtd)

static int bf5xx_pcm_i2s_new(struct snd_soc_pcm_runtime *rtd)

{

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_card *card = rtd->card->snd_card;

	size_t size = bf5xx_pcm_hardware.buffer_bytes_max;

	size_t size = bf5xx_pcm_hardware.buffer_bytes_max;

	int ret;





	pr_debug("%s enter\n", __func__);

	pr_debug("%s enter\n", __func__);

	if (!card->dev->dma_mask)

	ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32));

		card->dev->dma_mask = &bf5xx_pcm_dmamask;

	if (ret)

	if (!card->dev->coherent_dma_mask)

		return ret;

		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);





	return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,

	return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,

				SNDRV_DMA_TYPE_DEV, card->dev, size, size);

				SNDRV_DMA_TYPE_DEV, card->dev, size, size);

sound/soc/davinci/davinci-pcm.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -844,18 +844,15 @@ static void davinci_pcm_free(struct snd_pcm *pcm) 
	}

	}

}

}





static u64 davinci_pcm_dmamask = DMA_BIT_MASK(32);



static int davinci_pcm_new(struct snd_soc_pcm_runtime *rtd)

static int davinci_pcm_new(struct snd_soc_pcm_runtime *rtd)

{

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_card *card = rtd->card->snd_card;

	struct snd_pcm *pcm = rtd->pcm;

	struct snd_pcm *pcm = rtd->pcm;

	int ret;

	int ret;





	if (!card->dev->dma_mask)

	ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32));

		card->dev->dma_mask = &davinci_pcm_dmamask;

	if (ret)

	if (!card->dev->coherent_dma_mask)

		return ret;

		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);





	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		ret = davinci_pcm_preallocate_dma_buffer(pcm,

		ret = davinci_pcm_preallocate_dma_buffer(pcm,

CRA Git | Maintained and supported by SUSTech CRA and CCSE