lkml.org 
[lkml]   [2022]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 118/545] x86/pmem: Fix platform-device leak in error path
    Date
    From: Johan Hovold <johan@kernel.org>

    [ Upstream commit 229e73d46994f15314f58b2d39bf952111d89193 ]

    Make sure to free the platform device in the unlikely event that
    registration fails.

    Fixes: 7a67832c7e44 ("libnvdimm, e820: make CONFIG_X86_PMEM_LEGACY a tristate option")
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Link: https://lore.kernel.org/r/20220620140723.9810-1-johan@kernel.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/kernel/pmem.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    diff --git a/arch/x86/kernel/pmem.c b/arch/x86/kernel/pmem.c
    index 6b07faaa1579..23154d24b117 100644
    --- a/arch/x86/kernel/pmem.c
    +++ b/arch/x86/kernel/pmem.c
    @@ -27,6 +27,11 @@ static __init int register_e820_pmem(void)
    * simply here to trigger the module to load on demand.
    */
    pdev = platform_device_alloc("e820_pmem", -1);
    - return platform_device_add(pdev);
    +
    + rc = platform_device_add(pdev);
    + if (rc)
    + platform_device_put(pdev);
    +
    + return rc;
    }
    device_initcall(register_e820_pmem);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-19 18:05    [W:2.768 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site