| From 44fabd8cdaaa3acb80ad2bb3b5c61ae2136af661 Mon Sep 17 00:00:00 2001 |
| From: Kangjie Lu <kjlu@umn.edu> |
| Date: Tue, 25 Dec 2018 20:29:48 -0600 |
| Subject: ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages |
| |
| From: Kangjie Lu <kjlu@umn.edu> |
| |
| commit 44fabd8cdaaa3acb80ad2bb3b5c61ae2136af661 upstream. |
| |
| snd_pcm_lib_malloc_pages() may fail, so let's check its status and |
| return its error code upstream. |
| |
| Signed-off-by: Kangjie Lu <kjlu@umn.edu> |
| Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/soc/intel/atom/sst-mfld-platform-pcm.c | 8 +++++++- |
| 1 file changed, 7 insertions(+), 1 deletion(-) |
| |
| --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c |
| +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c |
| @@ -399,7 +399,13 @@ static int sst_media_hw_params(struct sn |
| struct snd_pcm_hw_params *params, |
| struct snd_soc_dai *dai) |
| { |
| - snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params)); |
| + int ret; |
| + |
| + ret = |
| + snd_pcm_lib_malloc_pages(substream, |
| + params_buffer_bytes(params)); |
| + if (ret) |
| + return ret; |
| memset(substream->runtime->dma_area, 0, params_buffer_bytes(params)); |
| return 0; |
| } |
