Skip to content

Commit

Permalink
ASoC: Intel: Atom: add a missing star in a memcpy call
Browse files Browse the repository at this point in the history
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: 60dc8db ("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>
Cc: stable@vger.kernel.org
  • Loading branch information
fishilico authored and broonie committed Sep 1, 2016
1 parent de34dcf commit 61ab0d4
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions sound/soc/intel/atom/sst/sst_pvt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 61ab0d4

Please sign in to comment.