diff --git a/fs/resctrlfs.c b/fs/resctrlfs.c
index e1c996ff4e791e455c5f0598c61416007d4ab248..7ca9fe3ee4a4fc8c5ce152dfb9a06d79b7202769 100644
--- a/fs/resctrlfs.c
+++ b/fs/resctrlfs.c
@@ -749,7 +749,7 @@ static int mkdir_resctrl_prepare(struct kernfs_node *parent_kn,
 		ret = closid_alloc();
 		if (ret < 0) {
 			rdt_last_cmd_puts("out of CLOSIDs\n");
-			goto out_unlock;
+			goto out_free_rdtgrp;
 		}
 		rdtgrp->closid.intpartid = ret;
 	}
@@ -819,10 +819,11 @@ static int mkdir_resctrl_prepare(struct kernfs_node *parent_kn,
 	kernfs_remove(rdtgrp->kn);
 out_free_rmid:
 	rmid_free(rdtgrp->mon.rmid);
-	kfree(rdtgrp);
 out_free_closid:
 	if (rdtgrp->type == RDTCTRL_GROUP)
 		closid_free(rdtgrp->closid.intpartid);
+out_free_rdtgrp:
+	kfree(rdtgrp);
 out_unlock:
 	resctrl_group_kn_unlock(prgrp_kn);
 	return ret;