lkml.org 
[lkml]   [2018]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 074/123] ASoC: sirf: Fix potential NULL pointer dereference
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Gustavo A. R. Silva <gustavo@embeddedor.com>

    commit ae1c696a480c67c45fb23b35162183f72c6be0e1 upstream.

    There is a potential execution path in which function
    platform_get_resource() returns NULL. If this happens,
    we will end up having a NULL pointer dereference.

    Fix this by replacing devm_ioremap with devm_ioremap_resource,
    which has the NULL check and the memory region request.

    This code was detected with the help of Coccinelle.

    Cc: stable@vger.kernel.org
    Fixes: 2bd8d1d5cf89 ("ASoC: sirf: Add audio usp interface driver")
    Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/sirf/sirf-usp.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    --- a/sound/soc/sirf/sirf-usp.c
    +++ b/sound/soc/sirf/sirf-usp.c
    @@ -370,10 +370,9 @@ static int sirf_usp_pcm_probe(struct pla
    platform_set_drvdata(pdev, usp);

    mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    - base = devm_ioremap(&pdev->dev, mem_res->start,
    - resource_size(mem_res));
    - if (base == NULL)
    - return -ENOMEM;
    + base = devm_ioremap_resource(&pdev->dev, mem_res);
    + if (IS_ERR(base))
    + return PTR_ERR(base);
    usp->regmap = devm_regmap_init_mmio(&pdev->dev, base,
    &sirf_usp_regmap_config);
    if (IS_ERR(usp->regmap))

    \
     
     \ /
      Last update: 2018-09-03 19:41    [W:4.025 / U:0.584 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site