fsnotify: Let userspace know about lost events due to ENOMEM

Currently if notification event is lost due to event allocation failing
we ENOMEM, we just silently continue (except for fanotify permission
events where we deny the access). This is undesirable as userspace has
no way of knowing whether the notifications it got are complete or not.
Treat lost events due to ENOMEM the same way as lost events due to queue
overflow so that userspace knows something bad happened and it likely
needs to rescan the filesystem.

Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
index 928f2a5eedb72eff36e1982f01de7021a14f999f..d51e1bb781cfd3df2d50488e34d40a334c8175a0 100644 (file)
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@ -221,8 +221,15 @@ static int fanotify_handle_event(struct fsnotify_group *group,
 
        event = fanotify_alloc_event(group, inode, mask, data);
        ret = -ENOMEM;
-       if (unlikely(!event))
+       if (unlikely(!event)) {
+               /*
+                * We don't queue overflow events for permission events as
+                * there the access is denied and so no event is in fact lost.
+                */
+               if (!fanotify_is_perm_event(mask))
+                       fsnotify_queue_overflow(group);
                goto finish;
+       }
 
        fsn_event = &event->fse;
        ret = fsnotify_add_event(group, fsn_event, fanotify_merge);

diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index 8b73332735ba5071f67c5f39b6079c506cdea6f7..40dedb37a1f3093f97ebca766c78284b4ba6385a 100644 (file)
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -99,8 +99,14 @@ int inotify_handle_event(struct fsnotify_group *group,
                              fsn_mark);
 
        event = kmalloc(alloc_len, GFP_KERNEL);
-       if (unlikely(!event))
+       if (unlikely(!event)) {
+               /*
+                * Treat lost event due to ENOMEM the same way as queue
+                * overflow to let userspace know event was lost.
+                */
+               fsnotify_queue_overflow(group);
                return -ENOMEM;
+       }
 
        fsn_event = &event->fse;
        fsnotify_init_event(fsn_event, inode, mask);

diff --git a/fs/notify/notification.c b/fs/notify/notification.c
index 66f85c651c52db2e03eb3fbe440569345192e436..3c3e36745f591cf8dd6953f71390afeccac58e81 100644 (file)
--- a/fs/notify/notification.c
+++ b/fs/notify/notification.c
@@ -111,7 +111,8 @@ int fsnotify_add_event(struct fsnotify_group *group,
                return 2;
        }
 
-       if (group->q_len >= group->max_events) {
+       if (event == group->overflow_event ||
+           group->q_len >= group->max_events) {
                ret = 2;
                /* Queue overflow event only if it isn't already queued */
                if (!list_empty(&group->overflow_event->list)) {

diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index 067d52e95f02e23711a5dfdbe0bc9d7736898510..9f1edb92c97ed00e410911ee9664ac7125e48271 100644 (file)
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -331,6 +331,12 @@ extern int fsnotify_add_event(struct fsnotify_group *group,
                              struct fsnotify_event *event,
                              int (*merge)(struct list_head *,
                                           struct fsnotify_event *));
+/* Queue overflow event to a notification group */
+static inline void fsnotify_queue_overflow(struct fsnotify_group *group)
+{
+       fsnotify_add_event(group, group->overflow_event, NULL);
+}
+
 /* true if the group notification queue is empty */
 extern bool fsnotify_notify_queue_is_empty(struct fsnotify_group *group);
 /* return, but do not dequeue the first event on the notification queue */