Skip to contentSkip to conversation

platform/chrome: cros_ec_debugfs: unregister panic notifier

PATCH In review Hongyan Xu 2 participants 2 messages Jul 28 – Jul 29

Subsystems (2)
lore
Share & tools
lore

Hongyan Xu

author
#0 lore raw

PATCH 1/1 platform/chrome: cros_ec_debugfs: unregister panic notifier

cros_ec_debugfs_probe() registers debug_info->notifier_panic with the EC panic notifier chain. The remove path tears down debugfs and cancels the console log work, but leaves the notifier on the chain. A later panic notification can call back into a removed driver instance and reschedule the delayed work.

Unregister the notifier before tearing down debugfs state. Also run the console-log cleanup in the probe error path.

This issue was found by a static analysis tool.

---
 drivers/platform/chrome/cros_ec_debugfs.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/platform/chrome/cros_ec_debugfs.c +3 -0
index 92ac9a2f9..6f93aedbd 100644
@@ -534,6 +534,7 @@ static int cros_ec_debugfs_probe(struct platform_device *pd)
 	return 0;
 
 remove_debugfs:
+	cros_ec_cleanup_console_log(debug_info);
 	debugfs_remove_recursive(debug_info->dir);
 	return ret;
 }
@@ -542,6 +543,8 @@ static void cros_ec_debugfs_remove(struct platform_device *pd)
 {
 	struct cros_ec_dev *ec = dev_get_drvdata(pd->dev.parent);
 
+	blocking_notifier_chain_unregister(&ec->ec_dev->panic_notifier,
+					   &ec->debug_info->notifier_panic);
 	debugfs_remove_recursive(ec->debug_info->dir);
 	cros_ec_cleanup_console_log(ec->debug_info);
 }
Signature · 1 line
2.50.1.windows.1
maintainer
#1 lore raw
Quoted 2 lines · Hongyan Xu

Unregister the notifier before tearing down debugfs state. Also run the console-log cleanup in the probe error path.

Thanks for looking into this. This should separate into 2 patches: 1 for cros_ec_cleanup_console_log() and 1 for blocking_notifier_chain_unregister().

drivers/platform/chrome/cros_ec_debugfs.c static int cros_ec_debugfs_probe(struct platform_device *pd) · line 537

Quoted 5 lines
drivers/platform/chrome/cros_ec_debugfs.c +1 -0
@@ -534,6 +534,7 @@ static int cros_ec_debugfs_probe(struct platform_device *pd)
 	return 0;
 
 remove_debugfs:
+	cros_ec_cleanup_console_log(debug_info);

It can be called even if cros_ec_create_console_log() isn't called. It's harmless because cros_ec_cleanup_console_log() checks debug_info->log_buffer.buf.

To be clear, I'd prefer to introduce a new goto label for fixing it.