lkml.org 
[lkml]   [2009]   [Jan]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 28/32] sgi-xpc: Remove NULL pointer dereference.
    2.6.27-stable review patch.  If anyone has any objections, please let us know.

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

    From: Robin Holt <holt@sgi.com>

    commit 17e2161654da4e6bdfd8d53d4f52e820ee93f423 upstream.

    If the bte copy fails, the attempt to retrieve payloads merely returns a
    null pointer deref and not NULL as was expected.

    Signed-off-by: Robin Holt <holt@sgi.com>
    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/misc/sgi-xp/xpc_sn2.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    --- a/drivers/misc/sgi-xp/xpc_sn2.c
    +++ b/drivers/misc/sgi-xp/xpc_sn2.c
    @@ -1962,11 +1962,13 @@ xpc_get_deliverable_payload_sn2(struct x

    msg = xpc_pull_remote_msg_sn2(ch, get);

    - DBUG_ON(msg != NULL && msg->number != get);
    - DBUG_ON(msg != NULL && (msg->flags & XPC_M_SN2_DONE));
    - DBUG_ON(msg != NULL && !(msg->flags & XPC_M_SN2_READY));
    + if (msg != NULL) {
    + DBUG_ON(msg->number != get);
    + DBUG_ON(msg->flags & XPC_M_SN2_DONE);
    + DBUG_ON(!(msg->flags & XPC_M_SN2_READY));

    - payload = &msg->payload;
    + payload = &msg->payload;
    + }
    break;
    }



    \
     
     \ /
      Last update: 2009-01-31 03:59    [W:0.022 / U:0.052 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site