mm/damon/sysfs-schemes: put damos dests dir after removing its files
Subsystems (2)
SeongJae Park
maintainerPATCH 1/1 mm/damon/sysfs-schemes: put damos dests dir after removing its files
damon_sysfs_scheme_rm_dirs() puts dests directory kobject before removing its internal files. Sincee putting the kobject frees its container struct, and the internal files removal accesses the container, use-after-free happens. Fix it by putting the reference _after_ removing the files.
---
Not Cc-ing stable@, since the broken commit is in 6.17-rc1 and hence probably this fix will land on the mainline before the release of the first 6.17 stable kernel (6.17.1).
mm/damon/sysfs-schemes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/damon/sysfs-schemes.c +1 -1
@@ -2158,8 +2158,8 @@ static void damon_sysfs_scheme_rm_dirs(struct damon_sysfs_scheme *scheme) {damon_sysfs_access_pattern_rm_dirs (scheme->access_pattern);kobject_put (&scheme->access_pattern->kobj); -kobject_put (&scheme->dests->kobj);damos_sysfs_dests_rm_dirs (scheme->dests); +kobject_put (&scheme->dests->kobj);damon_sysfs_quotas_rm_dirs (scheme->quotas);kobject_put (&scheme->quotas->kobj);kobject_put (&scheme->watermarks->kobj);
base-commit: 9aa69ba9d9e220ea1d8ba62592fe7ffba376b2cc
Signature · 1 line
2.39.5
Hi SeongJae,
Quoted 33 lines · SeongJae Park
damon_sysfs_scheme_rm_dirs()puts dests directory kobject before removing its internal files. Sincee putting the kobject frees its container struct, and the internal files removal accesses the container, use-after-free happens. Fix it by putting the reference _after_ removing the files.Reported-by Alexandre Ghiti <[email protected]>Fixes 2cd0bf85a203 ("mm/damon/sysfs-schemes: implement DAMOS action destinations directory") # 6.17.xSigned-off-by SeongJae Park <[email protected]>---
Not Cc-ing stable@, since the broken commit is in 6.17-rc1 and hence probably this fix will land on the mainline before the release of the first 6.17 stable kernel (6.17.1).mm/damon/sysfs-schemes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/damon/sysfs-schemes.c +1
-1@@ -2158,8 +2158,8 @@ static void damon_sysfs_scheme_rm_dirs(struct damon_sysfs_scheme *scheme) {damon_sysfs_access_pattern_rm_dirs (scheme->access_pattern);kobject_put (&scheme->access_pattern->kobj); -kobject_put (&scheme->dests->kobj);damos_sysfs_dests_rm_dirs (scheme->dests); +kobject_put (&scheme->dests->kobj);damon_sysfs_quotas_rm_dirs (scheme->quotas);kobject_put (&scheme->quotas->kobj);kobject_put (&scheme->watermarks->kobj);
Quoted 1 line
base-commit:
9aa69ba9d9e220ea1d8ba62592fe7ffba376b2cc
Thanks for the quick fix!
Alex