lkml.org 
[lkml]   [2012]   [Apr]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] spi/imx: prevent NULL pointer dereference in spi_imx_probe()
    Date
    When no platform_data is present and either 'spi-num-chipselects' is
    not defined in the DT or 'cs-gpios' has less entries than
    'spi-num-chipselects' specifies, the NULL platform_data pointer is
    being dereferenced.

    Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
    ---
    drivers/spi/spi-imx.c | 10 +++++++---
    1 files changed, 7 insertions(+), 3 deletions(-)

    diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
    index 373f4ff..570f220 100644
    --- a/drivers/spi/spi-imx.c
    +++ b/drivers/spi/spi-imx.c
    @@ -766,8 +766,12 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
    }

    ret = of_property_read_u32(np, "fsl,spi-num-chipselects", &num_cs);
    - if (ret < 0)
    - num_cs = mxc_platform_info->num_chipselect;
    + if (ret < 0) {
    + if (mxc_platform_info)
    + num_cs = mxc_platform_info->num_chipselect;
    + else
    + return ret;
    + }

    master = spi_alloc_master(&pdev->dev,
    sizeof(struct spi_imx_data) + sizeof(int) * num_cs);
    @@ -784,7 +788,7 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)

    for (i = 0; i < master->num_chipselect; i++) {
    int cs_gpio = of_get_named_gpio(np, "cs-gpios", i);
    - if (cs_gpio < 0)
    + if (cs_gpio < 0 && mxc_platform_info)
    cs_gpio = mxc_platform_info->chipselect[i];

    spi_imx->chipselect[i] = cs_gpio;
    --
    1.7.2.5
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2012-04-03 15:05    [W:0.021 / U:0.316 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site