Skip to content

Commit 63f5dec

Browse files
hqszakpm00
authored andcommitted
mm/damon/core: fix commit_ops_filters by using correct nth function
damos_commit_ops_filters() incorrectly uses damos_nth_filter() which iterates core_filters. As a result, performing a commit unintentionally corrupts ops_filters. Add damos_nth_ops_filter() which iterates ops_filters. Use this function to fix issues caused by wrong iteration. Link: https://lkml.kernel.org/r/20250810124201.15743-1-ekffu200098@gmail.com Fixes: 3607cc5 ("mm/damon/core: support committing ops_filters") # 6.15.x Signed-off-by: Sang-Heon Jeon <ekffu200098@gmail.com> Reviewed-by: SeongJae Park <sj@kernel.org> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 9a6a6a3 commit 63f5dec

1 file changed

Lines changed: 13 additions & 1 deletion

File tree

mm/damon/core.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,18 @@ static struct damos_filter *damos_nth_filter(int n, struct damos *s)
845845
return NULL;
846846
}
847847

848+
static struct damos_filter *damos_nth_ops_filter(int n, struct damos *s)
849+
{
850+
struct damos_filter *filter;
851+
int i = 0;
852+
853+
damos_for_each_ops_filter(filter, s) {
854+
if (i++ == n)
855+
return filter;
856+
}
857+
return NULL;
858+
}
859+
848860
static void damos_commit_filter_arg(
849861
struct damos_filter *dst, struct damos_filter *src)
850862
{
@@ -908,7 +920,7 @@ static int damos_commit_ops_filters(struct damos *dst, struct damos *src)
908920
int i = 0, j = 0;
909921

910922
damos_for_each_ops_filter_safe(dst_filter, next, dst) {
911-
src_filter = damos_nth_filter(i++, src);
923+
src_filter = damos_nth_ops_filter(i++, src);
912924
if (src_filter)
913925
damos_commit_filter(dst_filter, src_filter);
914926
else

0 commit comments

Comments
 (0)