2 files changed, 11 insertions, 2 deletions

diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 1d33d7db277..f9216102b42 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -707,7 +707,14 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)
                 group->max_events = FANOTIFY_DEFAULT_MAX_EVENTS;
         }
 
-        group->fanotify_data.max_marks = FANOTIFY_DEFAULT_MAX_MARKS;
+        if (flags & FAN_UNLIMITED_MARKS) {
+                fd = -EPERM;
+                if (!capable(CAP_SYS_ADMIN))
+                        goto out_put_group;
+                group->fanotify_data.max_marks = UINT_MAX;
+        } else {
+                group->fanotify_data.max_marks = FANOTIFY_DEFAULT_MAX_MARKS;
+        }
 
         fd = anon_inode_getfd("[fanotify]", &fanotify_fops, group, f_flags);
         if (fd < 0)
diff --git a/include/linux/fanotify.h b/include/linux/fanotify.h
index e37f559c95e..7592a366a57 100644
--- a/include/linux/fanotify.h
+++ b/include/linux/fanotify.h
@@ -32,9 +32,11 @@
                                  FAN_CLASS_PRE_CONTENT)
 
 #define FAN_UNLIMITED_QUEUE     0x00000010
+#define FAN_UNLIMITED_MARKS     0x00000020
 
 #define FAN_ALL_INIT_FLAGS      (FAN_CLOEXEC | FAN_NONBLOCK | \
-                                 FAN_ALL_CLASS_BITS | FAN_UNLIMITED_QUEUE)
+                                 FAN_ALL_CLASS_BITS | FAN_UNLIMITED_QUEUE |\
+                                 FAN_UNLIMITED_MARKS)
 
 /* flags used for fanotify_modify_mark() */
 #define FAN_MARK_ADD            0x00000001