lkml.org 
[lkml]   [2012]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 12/72] ARM: 7326/2: PL330: fix null pointer dereference in pl330_chan_ctrl()
    3.2-stable review patch.  If anyone has any objections, please let me know.

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

    From: Javi Merino <javi.merino@arm.com>

    commit 46e33c606af8e0caeeca374103189663d877c0d6 upstream.

    This fixes the thrd->req_running field being accessed before thrd
    is checked for null. The error was introduced in

    abb959f: ARM: 7237/1: PL330: Fix driver freeze

    Reference: <1326458191-23492-1-git-send-email-mans.rullgard@linaro.org>

    Signed-off-by: Mans Rullgard <mans.rullgard@linaro.org>
    Acked-by: Javi Merino <javi.merino@arm.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm/common/pl330.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/arch/arm/common/pl330.c
    +++ b/arch/arm/common/pl330.c
    @@ -1496,12 +1496,13 @@ int pl330_chan_ctrl(void *ch_id, enum pl
    struct pl330_thread *thrd = ch_id;
    struct pl330_dmac *pl330;
    unsigned long flags;
    - int ret = 0, active = thrd->req_running;
    + int ret = 0, active;

    if (!thrd || thrd->free || thrd->dmac->state == DYING)
    return -EINVAL;

    pl330 = thrd->dmac;
    + active = thrd->req_running;

    spin_lock_irqsave(&pl330->lock, flags);




    \
     
     \ /
      Last update: 2012-02-28 02:11    [W:0.019 / U:0.152 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site