mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Guangshuo Li <lgs201920130244@gmail.com>
To: "Bao Cheng Su" <baocheng.su@siemens.com>,
	"Benedikt Niedermayr" <benedikt.niedermayr@siemens.com>,
	"Tobias Schaffner" <tobias.schaffner@siemens.com>,
	"Hans de Goede" <hansg@kernel.org>,
	"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
	"Henning Schild" <henning.schild@siemens.com>,
	platform-driver-x86@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: Guangshuo Li <lgs201920130244@gmail.com>, stable@vger.kernel.org
Subject: [PATCH] platform/x86: simatic-ipc: fix platform device leak on registration failure
Date: Mon, 21 Sep 2026 15:53:12 +0800	[thread overview]
Message-ID: <20260921075312.120983-1-lgs201920130244@gmail.com> (raw)

register_platform_devices() creates multiple platform devices using
platform_device_register_data(), but returns directly when a later
platform device registration fails.

If LED or watchdog platform device registration fails, previously
registered platform devices are left registered. Since module init
failure does not invoke the module exit cleanup path, these platform
devices remain allocated and their backing platform_object memory is
leaked.

Unregister successfully created platform devices on registration failure
paths to restore the missing cleanup.

The issue was identified by a static analysis tool I developed and
confirmed by manual review.

Fixes: dd123e62bded ("platform/x86: simatic-ipc: add main driver for Siemens devices")
Cc: stable@vger.kernel.org
Signed-off-by: Guangshuo Li <lgs201920130244@gmail.com>
---
 drivers/platform/x86/siemens/simatic-ipc.c | 40 ++++++++++++++++++----
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/drivers/platform/x86/siemens/simatic-ipc.c b/drivers/platform/x86/siemens/simatic-ipc.c
index 7039874d8f11..9bf8b2d8248c 100644
--- a/drivers/platform/x86/siemens/simatic-ipc.c
+++ b/drivers/platform/x86/siemens/simatic-ipc.c
@@ -92,6 +92,7 @@ static int register_platform_devices(u32 station_id)
 	u8 wdtmode = SIMATIC_IPC_DEVICE_NONE;
 	u8 battmode = SIMATIC_IPC_DEVICE_NONE;
 	char *pdevname;
+	int ret;
 	int i;
 
 	for (i = 0; i < ARRAY_SIZE(device_modes); i++) {
@@ -118,8 +119,11 @@ static int register_platform_devices(u32 station_id)
 			platform_device_register_data(NULL, pdevname,
 				PLATFORM_DEVID_NONE, &platform_data,
 				sizeof(struct simatic_ipc_platform));
-		if (IS_ERR(ipc_batt_platform_device))
-			return PTR_ERR(ipc_batt_platform_device);
+		if (IS_ERR(ipc_batt_platform_device)) {
+			ret = PTR_ERR(ipc_batt_platform_device);
+			ipc_batt_platform_device = NULL;
+			goto err_unregister;
+		}
 
 		pr_debug("device=%s created\n",
 			 ipc_batt_platform_device->name);
@@ -139,8 +143,11 @@ static int register_platform_devices(u32 station_id)
 				pdevname, PLATFORM_DEVID_NONE,
 				&platform_data,
 				sizeof(struct simatic_ipc_platform));
-		if (IS_ERR(ipc_led_platform_device))
-			return PTR_ERR(ipc_led_platform_device);
+		if (IS_ERR(ipc_led_platform_device)) {
+			ret = PTR_ERR(ipc_led_platform_device);
+			ipc_led_platform_device = NULL;
+			goto err_unregister;
+		}
 
 		pr_debug("device=%s created\n",
 			 ipc_led_platform_device->name);
@@ -153,8 +160,11 @@ static int register_platform_devices(u32 station_id)
 				KBUILD_MODNAME "_wdt", PLATFORM_DEVID_NONE,
 				&platform_data,
 				sizeof(struct simatic_ipc_platform));
-		if (IS_ERR(ipc_wdt_platform_device))
-			return PTR_ERR(ipc_wdt_platform_device);
+		if (IS_ERR(ipc_wdt_platform_device)) {
+			ret = PTR_ERR(ipc_wdt_platform_device);
+			ipc_wdt_platform_device = NULL;
+			goto err_unregister;
+		}
 
 		pr_debug("device=%s created\n",
 			 ipc_wdt_platform_device->name);
@@ -169,6 +179,24 @@ static int register_platform_devices(u32 station_id)
 	}
 
 	return 0;
+
+err_unregister:
+	if (ipc_wdt_platform_device) {
+		platform_device_unregister(ipc_wdt_platform_device);
+		ipc_wdt_platform_device = NULL;
+	}
+
+	if (ipc_led_platform_device) {
+		platform_device_unregister(ipc_led_platform_device);
+		ipc_led_platform_device = NULL;
+	}
+
+	if (ipc_batt_platform_device) {
+		platform_device_unregister(ipc_batt_platform_device);
+		ipc_batt_platform_device = NULL;
+	}
+
+	return ret;
 }
 
 static void request_additional_modules(u32 station_id)
-- 
2.43.0


             reply	other threads:[~2026-09-21  7:53 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-21  7:53 Guangshuo Li [this message]
2026-09-21 10:10 ` Markus Elfring
2026-09-22  8:13   ` Guangshuo Li
2026-09-22  9:07     ` Markus Elfring
2026-09-22  9:51     ` Dan Carpenter
2026-09-21 15:05 ` krzk
2026-09-22  2:38   ` Guangshuo Li
2026-09-21 15:09 ` krzk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260921075312.120983-1-lgs201920130244@gmail.com \
    --to=lgs201920130244@gmail.com \
    --cc=baocheng.su@siemens.com \
    --cc=benedikt.niedermayr@siemens.com \
    --cc=hansg@kernel.org \
    --cc=henning.schild@siemens.com \
    --cc=ilpo.jarvinen@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=tobias.schaffner@siemens.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®