Skip to contentSkip to conversation

dlm: Fix kobject memleak

PATCH New Wang Hai 1 participant 1 message Jun 15, 2020 Distributed lock manager (DLM)

lore
Share & tools
lore

Wang Hai

author
#0 lore raw

PATCH 1/1 dlm: Fix kobject memleak

Currently the error return path from kobject_init_and_add() is not followed by a call to kobject_put() - which means we are leaking the kobject.

Set do_unreg = 1 before kobject_init_and_add() to ensure that kobject_put() can be called in its error patch.

Fixes 901195ed7f4b ("Kobject: change GFS2 to use kobject_init_and_add")
---
 fs/dlm/lockspace.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
fs/dlm/lockspace.c +3 -3
index afb8340..c689359 100644
@@ -632,6 +632,9 @@ static int new_lockspace(const char *name, const char *cluster,
 	wait_event(ls->ls_recover_lock_wait,
 		   test_bit(LSFL_RECOVER_LOCK, &ls->ls_flags));
 
+	/* let kobject handle freeing of ls if there's an error */
+	do_unreg = 1;
+
 	ls->ls_kobj.kset = dlm_kset;
 	error = kobject_init_and_add(&ls->ls_kobj, &dlm_ktype, NULL,
 				     "%s", ls->ls_name);
@@ -639,9 +642,6 @@ static int new_lockspace(const char *name, const char *cluster,
 		goto out_recoverd;
 	kobject_uevent(&ls->ls_kobj, KOBJ_ADD);
 
-	/* let kobject handle freeing of ls if there's an error */
-	do_unreg = 1;
-
 	/* This uevent triggers dlm_controld in userspace to add us to the
 	   group of nodes that are members of this lockspace (managed by the
 	   cluster infrastructure.)  Once it's done that, it tells us who the
Signature · 1 line
1.8.3.1