lkml.org 
[lkml]   [2014]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 149/163] ASoC: core: fix possible ZERO_SIZE_PTR pointer dereferencing error.
    Date
    3.13.11.9 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Xiubo Li <Li.Xiubo@freescale.com>

    commit 6596aa047b624aeec2ea321962cfdecf9953a383 upstream.

    Since we cannot make sure the 'params->num_regs' will always be none
    zero here, and then if it equals to zero, the kmemdup() will return
    ZERO_SIZE_PTR, which equals to ((void *)16).

    So this patch fix this with just doing the zero check before calling
    kmemdup().

    Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    [ kamal: backport to 3.13-stable: context ]
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    sound/soc/soc-core.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
    index a66783e..a3830d1 100644
    --- a/sound/soc/soc-core.c
    +++ b/sound/soc/soc-core.c
    @@ -3236,7 +3236,7 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
    unsigned int val;
    void *data;

    - if (!codec->using_regmap)
    + if (!codec->using_regmap || !params->num_regs)
    return -EINVAL;

    len = params->num_regs * codec->val_bytes;
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-10-09 23:42    [W:4.374 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site