Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index cd570cc79c76ab9873ce123dd7fd1d0e4412c0bc..220be9fa2c417c4cfccacde8b799d975ac730f06 100644 (file)
--- 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 (;;) {