2 files changed, 10 insertions, 1 deletions

diff --git a/fs/super.c b/fs/super.c
index f627b7c53d2b..cfadab2cbf35 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -1300,6 +1300,7 @@ int get_tree_bdev(struct fs_context *fc,
         mutex_lock(&bdev->bd_fsfreeze_mutex);
         if (bdev->bd_fsfreeze_count > 0) {
                 mutex_unlock(&bdev->bd_fsfreeze_mutex);
+                blkdev_put(bdev, mode);
                 warnf(fc, "%pg: Can't mount, blockdev is frozen", bdev);
                 return -EBUSY;
         }
@@ -1308,8 +1309,10 @@ int get_tree_bdev(struct fs_context *fc,
         fc->sget_key = bdev;
         s = sget_fc(fc, test_bdev_super_fc, set_bdev_super_fc);
         mutex_unlock(&bdev->bd_fsfreeze_mutex);
-        if (IS_ERR(s))
+        if (IS_ERR(s)) {
+                blkdev_put(bdev, mode);
                 return PTR_ERR(s);
+        }
 
         if (s->s_root) {
                 /* Don't summarily change the RO/RW state. */
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 (;;) {