From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B49C0C433F5 for ; Thu, 3 Mar 2022 18:04:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230436AbiCCSFL (ORCPT ); Thu, 3 Mar 2022 13:05:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229495AbiCCSFJ (ORCPT ); Thu, 3 Mar 2022 13:05:09 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4891D1598CC for ; Thu, 3 Mar 2022 10:04:24 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D44F3617C1 for ; Thu, 3 Mar 2022 18:04:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34CE6C004E1; Thu, 3 Mar 2022 18:04:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646330663; bh=TG3MIWaf6XLuAoCM6TlS+dnpL5s9KCujEz3ummq0Tzo=; h=From:To:Cc:Subject:Date:From; b=qCAna2W13jLFUOetxlrKfIQF/WxJoYvqsp8yx0D6wRu851O5dmW0eOUFwes5qi2Uu +g5ACxCvkG5Go2NTrWXcQHmIuvbVnEBEZNwTGuFgXcVVEtoR1HRXtpUvdBadGGVwMU s5v+xn9tsfdcDekg2Jlf86W6T3FV1to+d+NsGZk0IPZRP0iDJ9RtJBk2HUPlsddj7I viEXecDFIPWnGwG+9+HYy84X46WJ9dfAQH5QUrWXt2huhC/0asWkaSmBUoIxAr4g0R WwWkL6T+WA4YYPmJPEE4kwdIb4+pRo/Uu/XjPJ14OmXI0FvJ57b13LtcTJShs1V0A1 ZzhsPMzCZCUXQ== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1nPpoL-0000mb-NF; Thu, 03 Mar 2022 19:04:21 +0100 From: Johan Hovold To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH] x86/pmem: fix platform-device leak in error path Date: Thu, 3 Mar 2022 19:04:06 +0100 Message-Id: <20220303180406.2990-1-johan@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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.34.1