aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-10-28 17:21:57 -0400
committerEric Paris <eparis@redhat.com>2010-10-28 17:22:14 -0400
commit2529a0df0f64dab1f60ae08e038b89c53a6b4c02 (patch)
tree59f73938d84b78b535c91282677054d1f3dd1697 /fs
parent5322a59f14e4cae5f878b9c0c5612d403c230d7f (diff)
fsnotify: implement a default maximum queue depth
Currently fanotify has no maximum queue depth. Since fanotify is CAP_SYS_ADMIN only this does not pose a normal user DoS issue, but it certianly is possible that an fanotify listener which can't keep up could OOM the box. This patch implements a default 16k depth. This is the same default depth used by inotify, but given fanotify's better queue merging in many situations this queue will contain many additional useful events by comparison. Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/notify/fanotify/fanotify_user.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index b265936e92d..04f2fe47b66 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -16,6 +16,8 @@
16 16
17#include <asm/ioctls.h> 17#include <asm/ioctls.h>
18 18
19#define FANOTIFY_DEFAULT_MAX_EVENTS 16384
20
19extern const struct fsnotify_ops fanotify_fsnotify_ops; 21extern const struct fsnotify_ops fanotify_fsnotify_ops;
20 22
21static struct kmem_cache *fanotify_mark_cache __read_mostly; 23static struct kmem_cache *fanotify_mark_cache __read_mostly;
@@ -689,6 +691,8 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)
689 goto out_put_group; 691 goto out_put_group;
690 } 692 }
691 693
694 group->max_events = FANOTIFY_DEFAULT_MAX_EVENTS;
695
692 fd = anon_inode_getfd("[fanotify]", &fanotify_fops, group, f_flags); 696 fd = anon_inode_getfd("[fanotify]", &fanotify_fops, group, f_flags);
693 if (fd < 0) 697 if (fd < 0)
694 goto out_put_group; 698 goto out_put_group;