Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2417898b authored by Wei Yongjun's avatar Wei Yongjun Committed by Linus Torvalds
Browse files

ncpfs: fix error return code in ncp_parse_options() 



Fix to return -EINVAL from the option parse error handling case instead
of 0, as done elsewhere in this function.

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Cc: Petr Vandrovec <petr@vandrovec.name>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c707a81d

fs/ncpfs/inode.c

+9 −3
Original line number Diff line number Diff line
@@ -403,18 +403,24 @@ static int ncp_parse_options(struct ncp_mount_data_kernel *data, char *options) 
		switch (optval) {

			case 'u':

				data->uid = make_kuid(current_user_ns(), optint);

				if (!uid_valid(data->uid))

				if (!uid_valid(data->uid)) {

					ret = -EINVAL;

					goto err;

				}

				break;

			case 'g':

				data->gid = make_kgid(current_user_ns(), optint);

				if (!gid_valid(data->gid))

				if (!gid_valid(data->gid)) {

					ret = -EINVAL;

					goto err;

				}

				break;

			case 'o':

				data->mounted_uid = make_kuid(current_user_ns(), optint);

				if (!uid_valid(data->mounted_uid))

				if (!uid_valid(data->mounted_uid)) {

					ret = -EINVAL;

					goto err;

				}

				break;

			case 'm':

				data->file_mode = optint;