diff options
| author | Eric Paris <eparis@redhat.com> | 2010-10-28 17:21:58 -0400 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2010-10-28 17:22:15 -0400 |
| commit | 4afeff8505cb8a38e36c1ef2bd3447c4b8f87367 (patch) | |
| tree | 50a80d8773698813e4e9d9f9112079c09d493c48 /include/linux | |
| parent | ac7e22dcfafd04c842a02057afd6541c1d613ef9 (diff) | |
fanotify: limit number of listeners per user
fanotify currently has no limit on the number of listeners a given user can
have open. This patch limits the total number of listeners per user to
128. This is the same as the inotify default limit.
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fsnotify_backend.h | 1 | ||||
| -rw-r--r-- | include/linux/sched.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h index 49ceed6e92b1..4366f458a86a 100644 --- a/include/linux/fsnotify_backend.h +++ b/include/linux/fsnotify_backend.h | |||
| @@ -170,6 +170,7 @@ struct fsnotify_group { | |||
| 170 | #endif /* CONFIG_FANOTIFY_ACCESS_PERMISSIONS */ | 170 | #endif /* CONFIG_FANOTIFY_ACCESS_PERMISSIONS */ |
| 171 | int f_flags; | 171 | int f_flags; |
| 172 | unsigned int max_marks; | 172 | unsigned int max_marks; |
| 173 | struct user_struct *user; | ||
| 173 | } fanotify_data; | 174 | } fanotify_data; |
| 174 | #endif /* CONFIG_FANOTIFY */ | 175 | #endif /* CONFIG_FANOTIFY */ |
| 175 | }; | 176 | }; |
diff --git a/include/linux/sched.h b/include/linux/sched.h index be7adb7588e5..6f420baf37ca 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -672,6 +672,9 @@ struct user_struct { | |||
| 672 | atomic_t inotify_watches; /* How many inotify watches does this user have? */ | 672 | atomic_t inotify_watches; /* How many inotify watches does this user have? */ |
| 673 | atomic_t inotify_devs; /* How many inotify devs does this user have opened? */ | 673 | atomic_t inotify_devs; /* How many inotify devs does this user have opened? */ |
| 674 | #endif | 674 | #endif |
| 675 | #ifdef CONFIG_FANOTIFY | ||
| 676 | atomic_t fanotify_listeners; | ||
| 677 | #endif | ||
| 675 | #ifdef CONFIG_EPOLL | 678 | #ifdef CONFIG_EPOLL |
| 676 | atomic_t epoll_watches; /* The number of file descriptors currently watched */ | 679 | atomic_t epoll_watches; /* The number of file descriptors currently watched */ |
| 677 | #endif | 680 | #endif |
