lkml.org 
[lkml]   [2019]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.4 38/44] x86/platform/uv: Fix kmalloc() NULL check routine
    Date
    From: Austin Kim <austindh.kim@gmail.com>

    [ Upstream commit 864b23f0169d5bff677e8443a7a90dfd6b090afc ]

    The result of kmalloc() should have been checked ahead of below statement:

    pqp = (struct bau_pq_entry *)vp;

    Move BUG_ON(!vp) before above statement.

    Signed-off-by: Austin Kim <austindh.kim@gmail.com>
    Cc: Dimitri Sivanich <dimitri.sivanich@hpe.com>
    Cc: Hedi Berriche <hedi.berriche@hpe.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Mike Travis <mike.travis@hpe.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Russ Anderson <russ.anderson@hpe.com>
    Cc: Steve Wahl <steve.wahl@hpe.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: allison@lohutok.net
    Cc: andy@infradead.org
    Cc: armijn@tjaldur.nl
    Cc: bp@alien8.de
    Cc: dvhart@infradead.org
    Cc: gregkh@linuxfoundation.org
    Cc: hpa@zytor.com
    Cc: kjlu@umn.edu
    Cc: platform-driver-x86@vger.kernel.org
    Link: https://lkml.kernel.org/r/20190905232951.GA28779@LGEARND20B15
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/platform/uv/tlb_uv.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
    index 3b6ec42718e46..fd2149e8ca0f7 100644
    --- a/arch/x86/platform/uv/tlb_uv.c
    +++ b/arch/x86/platform/uv/tlb_uv.c
    @@ -1784,9 +1784,9 @@ static void pq_init(int node, int pnode)

    plsize = (DEST_Q_SIZE + 1) * sizeof(struct bau_pq_entry);
    vp = kmalloc_node(plsize, GFP_KERNEL, node);
    - pqp = (struct bau_pq_entry *)vp;
    - BUG_ON(!pqp);
    + BUG_ON(!vp);

    + pqp = (struct bau_pq_entry *)vp;
    cp = (char *)pqp + 31;
    pqp = (struct bau_pq_entry *)(((unsigned long)cp >> 5) << 5);

    --
    2.20.1
    \
     
     \ /
      Last update: 2019-09-22 21:02    [W:2.962 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site