]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mm/damon/sysfs: do not ignore callback's return value in damon_sysfs_damon_call()
authorAkinobu Mita <akinobu.mita@gmail.com>
Sat, 20 Sep 2025 13:25:46 +0000 (22:25 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 2 Oct 2025 11:48:38 +0000 (13:48 +0200)
commit 06195ee967d06ead757f9291bbaf1a0b30fa10b8 upstream.

The callback return value is ignored in damon_sysfs_damon_call(), which
means that it is not possible to detect invalid user input when writing
commands such as 'commit' to
/sys/kernel/mm/damon/admin/kdamonds/<K>/state.  Fix it.

Link: https://lkml.kernel.org/r/20250920132546.5822-1-akinobu.mita@gmail.com
Fixes: f64539dcdb87 ("mm/damon/sysfs: use damon_call() for update_schemes_stats")
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Reviewed-by: SeongJae Park <sj@kernel.org>
Cc: <stable@vger.kernel.org> [6.14+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
mm/damon/sysfs.c

index 57d4ec256682cee4ff8dadb855c1689192ce23cb..04f121a756d478e6d6f08be431cc0ac1a83f1478 100644 (file)
@@ -1576,12 +1576,14 @@ static int damon_sysfs_damon_call(int (*fn)(void *data),
                struct damon_sysfs_kdamond *kdamond)
 {
        struct damon_call_control call_control = {};
+       int err;
 
        if (!kdamond->damon_ctx)
                return -EINVAL;
        call_control.fn = fn;
        call_control.data = kdamond;
-       return damon_call(kdamond->damon_ctx, &call_control);
+       err = damon_call(kdamond->damon_ctx, &call_control);
+       return err ? err : call_control.return_code;
 }
 
 struct damon_sysfs_schemes_walk_data {