lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 196/235] ASoC: qdsp6: q6afe-dai: fix a range check in of_q6afe_parse_dai_data()
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit b8110a87b75f948d978c06e130cc68026645c4a1 ]

    The main thing is that the data->priv[] array has AFE_PORT_MAX elements
    so the > condition should be >=. But we may as well check for negative
    values as well just to be safe.

    Fixes: 24c4cbcfac09 ("ASoC: qdsp6: q6afe: Add q6afe dai driver")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    sound/soc/qcom/qdsp6/q6afe-dai.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/sound/soc/qcom/qdsp6/q6afe-dai.c
    +++ b/sound/soc/qcom/qdsp6/q6afe-dai.c
    @@ -1180,7 +1180,7 @@ static void of_q6afe_parse_dai_data(stru
    int id, i, num_lines;

    ret = of_property_read_u32(node, "reg", &id);
    - if (ret || id > AFE_PORT_MAX) {
    + if (ret || id < 0 || id >= AFE_PORT_MAX) {
    dev_err(dev, "valid dai id not found:%d\n", ret);
    continue;
    }

    \
     
     \ /
      Last update: 2018-09-24 14:49    [W:2.449 / U:0.280 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site