inotify: dont skip removal of watch descriptor if creation of ignored event failed

In inotify_ignored_and_remove_idr() the removal of a watch descriptor is skipped
if the allocation of an ignored event failed and we are leaking memory (the
watch descriptor and the mark linked to it).
This patch ensures that the watch descriptor is removed regardless of whether
event creation failed or not.

Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: Eric Paris <eparis@redhat.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 68f7bec1e664..a6879d169241 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -513,13 +513,13 @@ void inotify_ignored_and_remove_idr(struct fsnotify_mark *fsn_mark,
         struct fsnotify_event_private_data *fsn_event_priv;
         int ret;
 
+        i_mark = container_of(fsn_mark, struct inotify_inode_mark, fsn_mark);
+
         ignored_event = fsnotify_create_event(NULL, FS_IN_IGNORED, NULL,
                                               FSNOTIFY_EVENT_NONE, NULL, 0,
                                               GFP_NOFS);
         if (!ignored_event)
-                return;
-
-        i_mark = container_of(fsn_mark, struct inotify_inode_mark, fsn_mark);
+                goto skip_send_ignore;
 
         event_priv = kmem_cache_alloc(event_priv_cachep, GFP_NOFS);
         if (unlikely(!event_priv))
@@ -541,9 +541,9 @@ void inotify_ignored_and_remove_idr(struct fsnotify_mark *fsn_mark,
         }
 
 skip_send_ignore:
-
         /* matches the reference taken when the event was created */
-        fsnotify_put_event(ignored_event);
+        if (ignored_event)
+                fsnotify_put_event(ignored_event);
 
         /* remove this mark from the idr */
         inotify_remove_from_idr(group, i_mark);