Commit 3a9a3aa8 authored by BingJing Chang's avatar BingJing Chang Committed by Jan Kara
Browse files

udf: handle large user and group ID 

If uid or gid of mount options is larger than INT_MAX, udf_fill_super will
return -EINVAL.

The problem can be encountered by a domain user or reproduced via:
mount -o loop,uid=2147483648 something-in-udf-format.iso /mnt

This can be fixed as commit 233a01fa ("fuse: handle large user and
group ID").

Link: https://lore.kernel.org/r/20210129045502.10546-1-bingjingc@synology.com


Reviewed-by: default avatarRobbie Ko <robbieko@synology.com>
Reviewed-by: default avatarChung-Chiang Cheng <cccheng@synology.com>
Signed-off-by: default avatarBingJing Chang <bingjingc@synology.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent a0b3cb71

fs/udf/super.c

+5 −4
Original line number Diff line number Diff line
@@ -459,6 +459,7 @@ static int udf_parse_options(char *options, struct udf_options *uopt, 
{

	char *p;

	int option;

	unsigned int uv;



	uopt->novrs = 0;

	uopt->session = 0xFFFFFFFF;
@@ -508,17 +509,17 @@ static int udf_parse_options(char *options, struct udf_options *uopt, 
			uopt->flags &= ~(1 << UDF_FLAG_USE_SHORT_AD);

			break;

		case Opt_gid:

			if (match_int(args, &option))

			if (match_uint(args, &uv))

				return 0;

			uopt->gid = make_kgid(current_user_ns(), option);

			uopt->gid = make_kgid(current_user_ns(), uv);

			if (!gid_valid(uopt->gid))

				return 0;

			uopt->flags |= (1 << UDF_FLAG_GID_SET);

			break;

		case Opt_uid:

			if (match_int(args, &option))

			if (match_uint(args, &uv))

				return 0;

			uopt->uid = make_kuid(current_user_ns(), option);

			uopt->uid = make_kuid(current_user_ns(), uv);

			if (!uid_valid(uopt->uid))

				return 0;

			uopt->flags |= (1 << UDF_FLAG_UID_SET);