two fixups for DAMON sysfs' scheme filters support
Subsystems (2)
SeongJae Park
maintainercover two fixups for DAMON sysfs' scheme filters support
This patchset contains two fixups of DAMON sysfs' scheme filters support, which is in mm-unstable.
SeongJae Park (2):
mm/damon/sysfs-schemes: Fix leaking a filter for wrong cgroup path mm/damon/sysfs-schemes: Return an error for filter memcg path id
lookup failure
mm/damon/sysfs-schemes.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
Signature · 1 line
2.25.1
SeongJae Park
maintainerPATCH 1/2 mm/damon/sysfs-schemes: Fix leaking a filter for wrong cgroup path
Commit f36f860207efa ("mm/damon/sysfs-schemes: implement scheme filters") on mm-unstable introduced 'damon_syfs_set_scheme_filters()', which does not free newly allocated filter when it fails setting memcg id for the filter. As a result, the memory for the filter leaks. Fix it by freeing the filter before returning the error.
Coverity CID: 1530032
--- mm/damon/sysfs-schemes.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
mm/damon/sysfs-schemes.c +3 -1
@@ -1464,8 +1464,10 @@ static int damon_sysfs_set_scheme_filters(struct damos *scheme, err =damon_sysfs_memcg_path_to_id ( sysfs_filter->memcg_path, &filter->memcg_id); -if (err) +if (err) { +damos_destroy_filter (filter);return err; + } }damos_add_filter (scheme, filter); }
Signature · 1 line
2.25.1
SeongJae Park
maintainerPATCH 2/2 mm/damon/sysfs-schemes: Return an error for filter memcg path id lookup failure
In reply to SeongJae ParkCommit f36f860207ef ("mm/damon/sysfs-schemes: implement scheme filters") on mm-unstable introduced damon_sysfs_memcg_path_to_id(), which returns non-error even if it didn't find the memcg of the given path. Caller could check the failure by seeing if the 'id' has really set or not, but it's unnecessarily complicated. Return an error for the case instead.
--- mm/damon/sysfs-schemes.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
mm/damon/sysfs-schemes.c +3 -1
@@ -1418,6 +1418,7 @@ static int damon_sysfs_memcg_path_to_id(char *memcg_path, unsigned short *id) {struct mem_cgroup *memcg;char *path; +bool found = false;if (!memcg_path)return -EINVAL ;
@@ -1433,12 +1434,13 @@ static int damon_sysfs_memcg_path_to_id(char *memcg_path, unsigned short *id)continue ;if (damon_sysfs_memcg_path_eq (memcg, path, memcg_path)) { *id =mem_cgroup_id (memcg); + found = true;break ; } }kfree (path); -return 0 ; +return found ?0 : -EINVAL ; } static int damon_sysfs_set_scheme_filters(struct damos *scheme,
Signature · 1 line
2.25.1