Commit 9814cc83 authored by SeongJae Park's avatar SeongJae Park Committed by Andrew Morton
Browse files

mm/damon/sysfs: cleanup attrs subdirs on context dir setup failure 

When a context DAMON sysfs directory setup is failed after setup of attrs/
directory, subdirectories of attrs/ directory are not cleaned up.  As a
result, DAMON sysfs interface is nearly broken until the system reboots,
and the memory for the unremoved directory is leaked.

Cleanup the directories under such failures.

Link: https://lkml.kernel.org/r/20251225023043.18579-3-sj@kernel.org


Fixes: c951cd3b ("mm/damon: implement a minimal stub for sysfs-based DAMON interface")
Signed-off-by: default avatarSeongJae Park <sj@kernel.org>
Cc: chongjiapeng <jiapeng.chong@linux.alibaba.com>
Cc: <stable@vger.kernel.org> # 5.18.x
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a24ca8eb

mm/damon/sysfs.c

+3 −2
Original line number Diff line number Diff line
@@ -950,7 +950,7 @@ static int damon_sysfs_context_add_dirs(struct damon_sysfs_context *context) 


	err = damon_sysfs_context_set_targets(context);

	if (err)

		goto put_attrs_out;

		goto rmdir_put_attrs_out;



	err = damon_sysfs_context_set_schemes(context);

	if (err)
@@ -960,7 +960,8 @@ static int damon_sysfs_context_add_dirs(struct damon_sysfs_context *context) 
put_targets_attrs_out:

	kobject_put(&context->targets->kobj);

	context->targets = NULL;

put_attrs_out:

rmdir_put_attrs_out:

	damon_sysfs_attrs_rm_dirs(context->attrs);

	kobject_put(&context->attrs->kobj);

	context->attrs = NULL;

	return err;