diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-04 13:24:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-04 13:24:27 -0800 |
| commit | 4f9020ffde71ddb92bc2f65ce0b00232bc88c590 (patch) | |
| tree | e67b1f3499f255477cadf5f418319fffed117874 /fs/namespace.c | |
| parent | 736706bee3298208343a76096370e4f6a5c55915 (diff) | |
| parent | d3d6a18d7d351cbcc9b33dbedf710e65f8ce1595 (diff) | |
| download | linux-4f9020ffde71ddb92bc2f65ce0b00232bc88c590.tar.bz2 | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"Assorted fixes that sat in -next for a while, all over the place"
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
aio: Fix locking in aio_poll()
exec: Fix mem leak in kernel_read_file
copy_mount_string: Limit string length to PATH_MAX
cgroup: saner refcounting for cgroup_root
fix cgroup_do_mount() handling of failure exits
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 678ef175d63a..c4e83d94840c 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -2744,7 +2744,7 @@ void *copy_mount_options(const void __user * data) char *copy_mount_string(const void __user *data) { - return data ? strndup_user(data, PAGE_SIZE) : NULL; + return data ? strndup_user(data, PATH_MAX) : NULL; } /* |