diff options
| author | Nicolas Iooss <nicolas.iooss_linux@m4x.org> | 2016-08-28 21:10:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-22 12:06:48 +0200 |
| commit | 0022f74b26042c3ee2078f900630beb3391d663f (patch) | |
| tree | 8f525eb0e9303a50d6f6c2250f25f3995686ecc2 | |
| parent | 6faa698c35a43b9e74ea24e90fe37471d08d00d0 (diff) | |
| download | linux-stable-0022f74b26042c3ee2078f900630beb3391d663f.tar.gz linux-stable-0022f74b26042c3ee2078f900630beb3391d663f.tar.bz2 linux-stable-0022f74b26042c3ee2078f900630beb3391d663f.zip | |
ASoC: Intel: Atom: add a missing star in a memcpy call
commit 61ab0d403bbd9d5f6e000e3b5734049141b91f6f upstream.
In sst_prepare_and_post_msg(), when a response is received in "block",
the following code gets executed:
*data = kzalloc(block->size, GFP_KERNEL);
memcpy(data, (void *) block->data, block->size);
The memcpy() call overwrites the content of the *data pointer instead of
filling the newly-allocated memory (which pointer is hold by *data).
Fix this by merging kzalloc+memcpy into a single kmemdup() call.
Thanks Joe Perches for suggesting using kmemdup()
Fixes: 60dc8dbacb00 ("ASoC: Intel: sst: Add some helper functions")
Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | sound/soc/intel/atom/sst/sst_pvt.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sound/soc/intel/atom/sst/sst_pvt.c b/sound/soc/intel/atom/sst/sst_pvt.c index adb32fefd693..b1e6b8f34a6a 100644 --- a/sound/soc/intel/atom/sst/sst_pvt.c +++ b/sound/soc/intel/atom/sst/sst_pvt.c @@ -279,17 +279,15 @@ int sst_prepare_and_post_msg(struct intel_sst_drv *sst, if (response) { ret = sst_wait_timeout(sst, block); - if (ret < 0) { + if (ret < 0) goto out; - } else if(block->data) { - if (!data) - goto out; - *data = kzalloc(block->size, GFP_KERNEL); - if (!(*data)) { + + if (data && block->data) { + *data = kmemdup(block->data, block->size, GFP_KERNEL); + if (!*data) { ret = -ENOMEM; goto out; - } else - memcpy(data, (void *) block->data, block->size); + } } } out: |