diff options
| author | Jan Kara <jack@suse.cz> | 2019-02-21 13:47:23 +0300 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2019-02-21 13:47:23 +0300 |
| commit | b51905798195eeb427c873643b3ada0d7bd991a7 (patch) | |
| tree | a97c478964268f29f50ae0e2a98f36d22861aa05 | |
| parent | fabf7f29b3e2ce5ed9741bf06f3583cd7e82ed1c (diff) | |
| download | linux-b51905798195eeb427c873643b3ada0d7bd991a7.tar.xz | |
fanotify: Make waits for fanotify events only killable
Making waits for response to fanotify permission events interruptible
can result in EINTR returns from open(2) or other syscalls when there's
e.g. AV software that's monitoring the file. Orion reports that e.g.
bash is complaining like:
bash: /etc/bash_completion.d/itweb-settings.bash: Interrupted system call
So for now convert the wait from interruptible to only killable one.
That is mostly invisible to userspace. Sadly this breaks hibernation
with fanotify permission events pending again but we have to put more
thought into how to fix this without regressing userspace visible
behavior.
Reported-by: Orion Poplawski <orion@nwra.com>
Signed-off-by: Jan Kara <jack@suse.cz>
| -rw-r--r-- | fs/notify/fanotify/fanotify.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c index ff7b8a1cdfe1..6b9c27548997 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c @@ -92,8 +92,8 @@ static int fanotify_get_response(struct fsnotify_group *group, pr_debug("%s: group=%p event=%p\n", __func__, group, event); - ret = wait_event_interruptible(group->fanotify_data.access_waitq, - event->state == FAN_EVENT_ANSWERED); + ret = wait_event_killable(group->fanotify_data.access_waitq, + event->state == FAN_EVENT_ANSWERED); /* Signal pending? */ if (ret < 0) { spin_lock(&group->notification_lock); |