fanotify: stop permission watchdog when timeout is zero
Subsystems (3)
PATCH 1/1 fanotify: stop permission watchdog when timeout is zero
The fanotify permission watchdog can be disabled by writing zero to fs/fanotify/watchdog_timeout. fanotify_perm_watchdog_group_add() already checks for a zero timeout before scheduling the watchdog.
However, once the watchdog work has been scheduled, perm_group_watchdog() unconditionally schedules itself again with the current timeout. If the sysctl is changed to zero while the work is active, secs_to_jiffies(0) causes the work to be rescheduled immediately, resulting in a kworker busy loop.
Read the timeout once in perm_group_watchdog_schedule() and do not schedule the work when it is zero. This lets a running watchdog stop after the next execution when the sysctl is set to zero.
--- fs/notify/fanotify/fanotify_user.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
fs/notify/fanotify/fanotify_user.c +6 -1
@@ -112,7 +112,12 @@ static DECLARE_DELAYED_WORK(perm_group_work, perm_group_watchdog);static void perm_group_watchdog_schedule (void ) { -schedule_delayed_work (&perm_group_work,secs_to_jiffies (perm_group_timeout)); +int timeout =READ_ONCE (perm_group_timeout); + +if (!timeout) +return ; + +schedule_delayed_work (&perm_group_work,secs_to_jiffies (timeout)); }static void perm_group_watchdog (struct work_struct *work)
Signature · 1 line
2.51.0
Jan Kara
maintainerQuoted 10 lines · Yichong Chen
The fanotify permission watchdog can be disabled by writing zero to
fs/fanotify/watchdog_timeout.fanotify_perm_watchdog_group_add()already checks for a zero timeout before scheduling the watchdog.However, once the watchdog work has been scheduled,
perm_group_watchdog()unconditionally schedules itself again with the current timeout. If the sysctl is changed to zero while the work is active,secs_to_jiffies(0)causes the work to be rescheduled immediately, resulting in a kworker busy loop.
Quoted 6 lines
Read the timeout once in
perm_group_watchdog_schedule()and do not schedule the work when it is zero. This lets a running watchdog stop after the next execution when the sysctl is set to zero.Fixes b8cf8fda522d ("fanotify: add watchdog for permission events")Signed-off-by Yichong Chen <[email protected]>
Thanks! I've added the patch to my tree.
Honza
Quoted 25 lines
--- fs/notify/fanotify/fanotify_user.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)fs/notify/fanotify/fanotify_user.c +6
-1@@ -112,7 +112,12 @@ static DECLARE_DELAYED_WORK(perm_group_work, perm_group_watchdog);static void perm_group_watchdog_schedule (void ) { -schedule_delayed_work (&perm_group_work,secs_to_jiffies (perm_group_timeout)); +int timeout =READ_ONCE (perm_group_timeout); + +if (!timeout) +return ; + +schedule_delayed_work (&perm_group_work,secs_to_jiffies (timeout)); }static void perm_group_watchdog (struct work_struct *work)Signature · 1 line
2.51.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR