lkml.org 
[lkml]   [2019]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 22/50] x86/hpet: Prevent potential NULL pointer dereference
    Date
    [ Upstream commit 2e84f116afca3719c9d0a1a78b47b48f75fd5724 ]

    hpet_virt_address may be NULL when ioremap_nocache fail, but the code lacks
    a check.

    Add a check to prevent NULL pointer dereference.

    Signed-off-by: Aditya Pakki <pakki001@umn.edu>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: kjlu@umn.edu
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Cc: Kees Cook <keescook@chromium.org>
    Cc: Joe Perches <joe@perches.com>
    Cc: Nicolai Stange <nstange@suse.de>
    Cc: Roland Dreier <roland@purestorage.com>
    Link: https://lkml.kernel.org/r/20190319021958.17275-1-pakki001@umn.edu
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/kernel/hpet.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
    index 756634f14df6..775c23d4021a 100644
    --- a/arch/x86/kernel/hpet.c
    +++ b/arch/x86/kernel/hpet.c
    @@ -914,6 +914,8 @@ int __init hpet_enable(void)
    return 0;

    hpet_set_mapping();
    + if (!hpet_virt_address)
    + return 0;

    /*
    * Read the period and check for a sane value:
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-04-18 20:10    [W:2.936 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site