diff options
| author | Linus Torvalds | 2019-07-11 05:09:17 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-07-11 05:09:17 +0200 |
| commit | e6983afd9254c559acf67dd5f62df824d19851eb (patch) | |
| tree | 06ab8b4457f90b5776b4d7cd7b340bd81b907eb0 /fs/proc | |
| parent | Merge tag 'locks-v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jla... (diff) | |
| parent | fsnotify: get rid of fsnotify_nameremove() (diff) | |
| download | kernel-qcow2-linux-e6983afd9254c559acf67dd5f62df824d19851eb.tar.gz kernel-qcow2-linux-e6983afd9254c559acf67dd5f62df824d19851eb.tar.xz kernel-qcow2-linux-e6983afd9254c559acf67dd5f62df824d19851eb.zip | |
Merge tag 'fsnotify_for_v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull fsnotify updates from Jan Kara:
"This contains cleanups of the fsnotify name removal hook and also a
patch to disable fanotify permission events for 'proc' filesystem"
* tag 'fsnotify_for_v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
fsnotify: get rid of fsnotify_nameremove()
fsnotify: move fsnotify_nameremove() hook out of d_delete()
configfs: call fsnotify_rmdir() hook
debugfs: call fsnotify_{unlink,rmdir}() hooks
debugfs: simplify __debugfs_remove_file()
devpts: call fsnotify_unlink() hook
tracefs: call fsnotify_{unlink,rmdir}() hooks
rpc_pipefs: call fsnotify_{unlink,rmdir}() hooks
btrfs: call fsnotify_rmdir() hook
fsnotify: add empty fsnotify_{unlink,rmdir}() hooks
fanotify: Disallow permission events for proc filesystem
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/root.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index 8b145e7b9661..522199e9525e 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -211,7 +211,7 @@ static struct file_system_type proc_fs_type = { .init_fs_context = proc_init_fs_context, .parameters = &proc_fs_parameters, .kill_sb = proc_kill_sb, - .fs_flags = FS_USERNS_MOUNT, + .fs_flags = FS_USERNS_MOUNT | FS_DISALLOW_NOTIFY_PERM, }; void __init proc_root_init(void) |