Merge tag 'modules-6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux

torvalds · torvalds · commit 29fe5d50dfa6 · 2025-05-09T09:09:49.000-07:00
Pull modules fix from Petr Pavlu: "A single fix to prevent use of an uninitialized completion pointer when releasing a module_kobject in specific situations. This addresses a latent bug exposed by commit f95bbfe ("drivers: base: handle module_kobject creation")" * tag 'modules-6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux: module: ensure that kobject_put() is safe for module type kobjects
diff --git a/kernel/params.c b/kernel/params.c
@@ -943,7 +943,9 @@ struct kset *module_kset;
 static void module_kobj_release(struct kobject *kobj)
 {
 	struct module_kobject *mk = to_module_kobject(kobj);
-	complete(mk->kobj_completion);
+
+	if (mk->kobj_completion)
+		complete(mk->kobj_completion);
 }
 
 const struct kobj_type module_ktype = {

Original file line number	Diff line number	Diff line change
`@@ -943,7 +943,9 @@ struct kset *module_kset;`
`943`	`943`	`static void module_kobj_release(struct kobject *kobj)`
`944`	`944`	`{`
`945`	`945`	`struct module_kobject *mk = to_module_kobject(kobj);`
`946`		`- complete(mk->kobj_completion);`
	`946`	`+`
	`947`	`+ if (mk->kobj_completion)`
	`948`	`+ complete(mk->kobj_completion);`
`947`	`949`	`}`
`948`	`950`
`949`	`951`	`const struct kobj_type module_ktype = {`