[Devel] [vz7 v2 PATCH 1/2] devcg: Move match_exception_partial before match_exception PSBM-144033

[Pavel Tikhomirov]

Maybe just put a match_exception_partial declaration line above 
match_exception, to decrease next rebase work with it, also this 
one-liner could be logically merged to second patch.

On 19.01.2023 15:52, Nikolay Borisov wrote:
> This is required as the latter would call the former in upcoming
> patch.
> 
> Signed-off-by: Nikolay Borisov <nikolay.borisov at virtuozzo.com>
> ---
> v2:
>   * Fix compilation breakage
>   * Removed irrelevant changes
> 
>   security/device_cgroup.c | 85 +++++++++++++++++++++-------------------
>   1 file changed, 44 insertions(+), 41 deletions(-)
> 
> diff --git a/security/device_cgroup.c b/security/device_cgroup.c
> index f9d205f95c25..2f6d5e0ffd00 100644
> --- a/security/device_cgroup.c
> +++ b/security/device_cgroup.c
> @@ -387,42 +387,45 @@ static int devcgroup_seq_read(struct cgroup *cgroup, struct cftype *cft,
>   }
> 
>   /**
> - * match_exception	- iterates the exception list trying to match a rule
> - * 			  based on type, major, minor and access type. It is
> - * 			  considered a match if an exception is found that
> - * 			  will contain the entire range of provided parameters.
> + * match_exception_partial - iterates the exception list trying to match a rule
> + * 			     based on type, major, minor and access type. It is
> + * 			     considered a match if an exception's range is
> + * 			     found to contain *any* of the devices specified by
> + * 			     provided parameters. This is used to make sure no
> + * 			     extra access is being granted that is forbidden by
> + * 			     any of the exception list.
>    * @exceptions: list of exceptions
>    * @type: device type (DEV_BLOCK or DEV_CHAR)
>    * @major: device file major number, ~0 to match all
>    * @minor: device file minor number, ~0 to match all
>    * @access: permission mask (ACC_READ, ACC_WRITE, ACC_MKNOD)
>    *
> - * returns: true in case it matches an exception completely
> + * returns: true in case the provided range mat matches an exception completely
>    */
> -static bool match_exception(struct list_head *exceptions, short type,
> -			    u32 major, u32 minor, short access)
> +static bool match_exception_partial(struct list_head *exceptions, short type,
> +				    u32 major, u32 minor, short access)
>   {
>   	struct dev_exception_item *ex;
> 
>   	list_for_each_entry_rcu(ex, exceptions, list) {
> -		short mismatched_bits;
> -		bool allowed_mount;
> -
>   		if ((type & DEV_BLOCK) && !(ex->type & DEV_BLOCK))
>   			continue;
>   		if ((type & DEV_CHAR) && !(ex->type & DEV_CHAR))
>   			continue;
> -		if (ex->major != ~0 && ex->major != major)
> +		/*
> +		 * We must be sure that both the exception and the provided
> +		 * range aren't masking all devices
> +		 */
> +		if (ex->major != ~0 && major != ~0 && ex->major != major)
>   			continue;
> -		if (ex->minor != ~0 && ex->minor != minor)
> +		if (ex->minor != ~0 && minor != ~0 && ex->minor != minor)
>   			continue;
> -		/* provided access cannot have more than the exception rule */
> -		mismatched_bits = access & (~ex->access) & ~ACC_MOUNT;
> -		allowed_mount = !(mismatched_bits & ~ACC_WRITE) &&
> -				(ex->access & ACC_MOUNT) &&
> -				(access & ACC_MOUNT);
> -
> -		if (mismatched_bits && !allowed_mount)
> +		/*
> +		 * In order to make sure the provided range isn't matching
> +		 * an exception, all its access bits shouldn't match the
> +		 * exception's access bits
> +		 */
> +		if (!(access & ex->access))
>   			continue;
>   		return true;
>   	}
> @@ -430,48 +433,48 @@ static bool match_exception(struct list_head *exceptions, short type,
>   }
> 
>   /**
> - * match_exception_partial - iterates the exception list trying to match a rule
> - * 			     based on type, major, minor and access type. It is
> - * 			     considered a match if an exception's range is
> - * 			     found to contain *any* of the devices specified by
> - * 			     provided parameters. This is used to make sure no
> - * 			     extra access is being granted that is forbidden by
> - * 			     any of the exception list.
> + * match_exception	- iterates the exception list trying to match a rule
> + *			  based on type, major, minor and access type. It is
> + *			  considered a match if an exception is found that
> + *			  will contain the entire range of provided parameters.
>    * @exceptions: list of exceptions
>    * @type: device type (DEV_BLOCK or DEV_CHAR)
>    * @major: device file major number, ~0 to match all
>    * @minor: device file minor number, ~0 to match all
>    * @access: permission mask (ACC_READ, ACC_WRITE, ACC_MKNOD)
>    *
> - * returns: true in case the provided range mat matches an exception completely
> + * returns: true in case it matches an exception completely
>    */
> -static bool match_exception_partial(struct list_head *exceptions, short type,
> -				    u32 major, u32 minor, short access)
> +static bool match_exception(struct list_head *exceptions, short type,
> +			    u32 major, u32 minor, short access)
>   {
>   	struct dev_exception_item *ex;
> 
>   	list_for_each_entry_rcu(ex, exceptions, list) {
> +		short mismatched_bits;
> +		bool allowed_mount;
> +
>   		if ((type & DEV_BLOCK) && !(ex->type & DEV_BLOCK))
>   			continue;
>   		if ((type & DEV_CHAR) && !(ex->type & DEV_CHAR))
>   			continue;
> -		/*
> -		 * We must be sure that both the exception and the provided
> -		 * range aren't masking all devices
> -		 */
> -		if (ex->major != ~0 && major != ~0 && ex->major != major)
> +		if (ex->major != ~0 && ex->major != major)
>   			continue;
> -		if (ex->minor != ~0 && minor != ~0 && ex->minor != minor)
> +		if (ex->minor != ~0 && ex->minor != minor)
>   			continue;
> -		/*
> -		 * In order to make sure the provided range isn't matching
> -		 * an exception, all its access bits shouldn't match the
> -		 * exception's access bits
> -		 */
> -		if (!(access & ex->access))
> +
> +		/* provided access cannot have more than the exception rule */
> +		mismatched_bits = access & (~ex->access) & ~ACC_MOUNT;
> +		allowed_mount = !(mismatched_bits & ~ACC_WRITE) &&
> +				(ex->access & ACC_MOUNT) &&
> +				(access & ACC_MOUNT);
> +
> +		if (mismatched_bits && !allowed_mount)
>   			continue;
> +
>   		return true;
>   	}
> +
>   	return false;
>   }
> 
> --
> 2.34.1
> 
> _______________________________________________
> Devel mailing list
> Devel at openvz.org
> https://lists.openvz.org/mailman/listinfo/devel

-- 
Best regards, Tikhomirov Pavel
Software Developer, Virtuozzo.