diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-10 08:16:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-10 08:16:44 -0700 |
| commit | 015c21ba59fcbc522d7a9d1e0ab0f0e6c0895ff0 (patch) | |
| tree | 4fa0e91287d927e9df8e1658f93c40ca9efd60bc /mm | |
| parent | 5e48e55fb57a9026e6b3b6961def6d2aeb210659 (diff) | |
| parent | 6fcf0c72e4b9360768cf5ef543c4f14c34800ee8 (diff) | |
| download | linux-015c21ba59fcbc522d7a9d1e0ab0f0e6c0895ff0.tar.gz linux-015c21ba59fcbc522d7a9d1e0ab0f0e6c0895ff0.tar.bz2 linux-015c21ba59fcbc522d7a9d1e0ab0f0e6c0895ff0.zip | |
Merge branch 'work.mount3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull mount fixes from Al Viro:
"A couple of regressions from the mount series"
* 'work.mount3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
vfs: add missing blkdev_put() in get_tree_bdev()
shmem: fix LSM options parsing
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/shmem.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index cd570cc79c76..220be9fa2c41 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3482,6 +3482,12 @@ static int shmem_parse_options(struct fs_context *fc, void *data) { char *options = data; + if (options) { + int err = security_sb_eat_lsm_opts(options, &fc->security); + if (err) + return err; + } + while (options != NULL) { char *this_char = options; for (;;) { |