Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b7f674c authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

x86/pmem: Fix platform-device leak in error path 



[ Upstream commit 229e73d46994f15314f58b2d39bf952111d89193 ]

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

Fixes: 7a67832c ("libnvdimm, e820: make CONFIG_X86_PMEM_LEGACY a tristate option")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20220620140723.9810-1-johan@kernel.org


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5afe042c

arch/x86/kernel/pmem.c

+6 −1
Original line number Diff line number Diff line
@@ -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);