lkml.org 
[lkml]   [2019]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 024/157] tty: atmel_serial: fix a potential NULL pointer dereference
    3.16.72-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Kangjie Lu <kjlu@umn.edu>

    commit c85be041065c0be8bc48eda4c45e0319caf1d0e5 upstream.

    In case dmaengine_prep_dma_cyclic fails, the fix returns a proper
    error code to avoid NULL pointer dereference.

    Signed-off-by: Kangjie Lu <kjlu@umn.edu>
    Fixes: 34df42f59a60 ("serial: at91: add rx dma support")
    Acked-by: Richard Genoud <richard.genoud@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    [bwh: Backported to 3.16: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/tty/serial/atmel_serial.c | 4 ++++
    1 file changed, 4 insertions(+)

    --- a/drivers/tty/serial/atmel_serial.c
    +++ b/drivers/tty/serial/atmel_serial.c
    @@ -1045,6 +1045,10 @@ static int atmel_prepare_rx_dma(struct u
    sg_dma_len(&atmel_port->sg_rx)/2,
    DMA_DEV_TO_MEM,
    DMA_PREP_INTERRUPT);
    + if (!desc) {
    + dev_err(port->dev, "Preparing DMA cyclic failed\n");
    + goto chan_err;
    + }
    desc->callback = atmel_complete_rx_dma;
    desc->callback_param = port;
    atmel_port->desc_rx = desc;
    \
     
     \ /
      Last update: 2019-08-10 22:53    [W:4.029 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site