|
@@ -951,6 +951,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
|
|
|
struct inode *root;
|
|
struct inode *root;
|
|
|
long err = -EINVAL;
|
|
long err = -EINVAL;
|
|
|
bool retry = true;
|
|
bool retry = true;
|
|
|
|
|
+ char *options = NULL;
|
|
|
int i;
|
|
int i;
|
|
|
|
|
|
|
|
try_onemore:
|
|
try_onemore:
|
|
@@ -982,9 +983,15 @@ try_onemore:
|
|
|
set_opt(sbi, POSIX_ACL);
|
|
set_opt(sbi, POSIX_ACL);
|
|
|
#endif
|
|
#endif
|
|
|
/* parse mount options */
|
|
/* parse mount options */
|
|
|
- err = parse_options(sb, (char *)data);
|
|
|
|
|
- if (err)
|
|
|
|
|
|
|
+ options = kstrdup((const char *)data, GFP_KERNEL);
|
|
|
|
|
+ if (data && !options) {
|
|
|
|
|
+ err = -ENOMEM;
|
|
|
goto free_sb_buf;
|
|
goto free_sb_buf;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ err = parse_options(sb, options);
|
|
|
|
|
+ if (err)
|
|
|
|
|
+ goto free_options;
|
|
|
|
|
|
|
|
sb->s_maxbytes = max_file_size(le32_to_cpu(raw_super->log_blocksize));
|
|
sb->s_maxbytes = max_file_size(le32_to_cpu(raw_super->log_blocksize));
|
|
|
sb->s_max_links = F2FS_LINK_MAX;
|
|
sb->s_max_links = F2FS_LINK_MAX;
|
|
@@ -1028,7 +1035,7 @@ try_onemore:
|
|
|
if (IS_ERR(sbi->meta_inode)) {
|
|
if (IS_ERR(sbi->meta_inode)) {
|
|
|
f2fs_msg(sb, KERN_ERR, "Failed to read F2FS meta data inode");
|
|
f2fs_msg(sb, KERN_ERR, "Failed to read F2FS meta data inode");
|
|
|
err = PTR_ERR(sbi->meta_inode);
|
|
err = PTR_ERR(sbi->meta_inode);
|
|
|
- goto free_sb_buf;
|
|
|
|
|
|
|
+ goto free_options;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
err = get_valid_checkpoint(sbi);
|
|
err = get_valid_checkpoint(sbi);
|
|
@@ -1153,6 +1160,7 @@ try_onemore:
|
|
|
if (err)
|
|
if (err)
|
|
|
goto free_kobj;
|
|
goto free_kobj;
|
|
|
}
|
|
}
|
|
|
|
|
+ kfree(options);
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
|
|
free_kobj:
|
|
free_kobj:
|
|
@@ -1177,6 +1185,8 @@ free_cp:
|
|
|
free_meta_inode:
|
|
free_meta_inode:
|
|
|
make_bad_inode(sbi->meta_inode);
|
|
make_bad_inode(sbi->meta_inode);
|
|
|
iput(sbi->meta_inode);
|
|
iput(sbi->meta_inode);
|
|
|
|
|
+free_options:
|
|
|
|
|
+ kfree(options);
|
|
|
free_sb_buf:
|
|
free_sb_buf:
|
|
|
brelse(raw_super_buf);
|
|
brelse(raw_super_buf);
|
|
|
free_sbi:
|
|
free_sbi:
|