diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-10 21:10:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-10 21:10:02 +0200 |
| commit | f5364c150aa645b3d7daa21b5c0b9feaa1c9cd6d (patch) | |
| tree | a7445608f147d3a7214382c5db3f5d721ee99369 /fs/proc | |
| parent | Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm6... (diff) | |
| parent | sched: panic on corrupted stack end (diff) | |
| download | linux-f5364c150aa645b3d7daa21b5c0b9feaa1c9cd6d.tar.xz linux-f5364c150aa645b3d7daa21b5c0b9feaa1c9cd6d.zip | |
Merge branch 'stacking-fixes' (vfs stacking fixes from Jann)
Merge filesystem stacking fixes from Jann Horn.
* emailed patches from Jann Horn <jannh@google.com>:
sched: panic on corrupted stack end
ecryptfs: forbid opening files without mmap handler
proc: prevent stacking filesystems on top
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/root.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index 55bc7d6c8aac..06702783bf40 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -121,6 +121,13 @@ static struct dentry *proc_mount(struct file_system_type *fs_type, if (IS_ERR(sb)) return ERR_CAST(sb); + /* + * procfs isn't actually a stacking filesystem; however, there is + * too much magic going on inside it to permit stacking things on + * top of it + */ + sb->s_stack_depth = FILESYSTEM_MAX_STACK_DEPTH; + if (!proc_parse_options(options, ns)) { deactivate_locked_super(sb); return ERR_PTR(-EINVAL); |