lkml.org 
[lkml]   [2016]   [Oct]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.8 31/57] ASoC: Intel: Atom: add a missing star in a memcpy call
    Date
    4.8-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Nicolas Iooss <nicolas.iooss_linux@m4x.org>

    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>

    ---
    sound/soc/intel/atom/sst/sst_pvt.c | 14 ++++++--------
    1 file changed, 6 insertions(+), 8 deletions(-)

    --- 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 inte

    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:

    \
     
     \ /
      Last update: 2016-10-21 11:21    [W:4.654 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site