Commit d41076ea authored by Chengguang Xu's avatar Chengguang Xu Committed by Greg Kroah-Hartman
Browse files

staging: erofs: option validation in remount 



Add option validation in remount. After this patch, remount
can change recognized options, and for unknown options remount
will fail and report error.

Signed-off-by: default avatarChengguang Xu <cgxu519@gmx.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Reviewed-by: default avatarGao Xiang <gaoxiang25@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2ab3dd84

drivers/staging/erofs/super.c

+31 −6
Original line number Diff line number Diff line
@@ -145,14 +145,10 @@ char *erofs_fault_name[FAULT_MAX] = { 
	[FAULT_KMALLOC]		= "kmalloc",

};



static int erofs_build_fault_attr(struct erofs_sb_info *sbi,

				  substring_t *args)

static void __erofs_build_fault_attr(struct erofs_sb_info *sbi,

				     unsigned int rate)

{

	struct erofs_fault_info *ffi = &sbi->fault_info;

	int rate = 0;



	if (args->from && match_int(args, &rate))

		return -EINVAL;



	if (rate) {

		atomic_set(&ffi->inject_ops, 0);
@@ -163,6 +159,17 @@ static int erofs_build_fault_attr(struct erofs_sb_info *sbi, 
	}



	set_opt(sbi, FAULT_INJECTION);

}



static int erofs_build_fault_attr(struct erofs_sb_info *sbi,

				  substring_t *args)

{

	int rate = 0;



	if (args->from && match_int(args, &rate))

		return -EINVAL;



	__erofs_build_fault_attr(sbi, rate);

	return 0;

}
@@ -171,6 +178,11 @@ static unsigned int erofs_get_fault_rate(struct erofs_sb_info *sbi) 
	return sbi->fault_info.inject_rate;

}

#else

static void __erofs_build_fault_attr(struct erofs_sb_info *sbi,

				     unsigned int rate)

{

}



static int erofs_build_fault_attr(struct erofs_sb_info *sbi,

				  substring_t *args)

{
@@ -649,10 +661,23 @@ static int erofs_show_options(struct seq_file *seq, struct dentry *root) 


static int erofs_remount(struct super_block *sb, int *flags, char *data)

{

	struct erofs_sb_info *sbi = EROFS_SB(sb);

	unsigned int org_mnt_opt = sbi->mount_opt;

	unsigned int org_inject_rate = erofs_get_fault_rate(sbi);

	int err;



	BUG_ON(!sb_rdonly(sb));

	err = parse_options(sb, data);

	if (err)

		goto out;



	*flags |= SB_RDONLY;

	return 0;

out:

	__erofs_build_fault_attr(sbi, org_inject_rate);

	sbi->mount_opt = org_mnt_opt;



	return err;

}



const struct super_operations erofs_sops = {