Re: [tipc-discussion] [net] tipc: fix link name length check

[Jon M. <jon...@er...>]

Acked-by: Jon

> -----Original Message-----
> From: joh...@de... <joh...@de...>
> Sent: 25-Nov-19 01:35
> To: tip...@li...
> Subject: [tipc-discussion] [net] tipc: fix link name length check
> 
> From: John Rutherford <joh...@de...>
> 
> In commit 4f07b80c9733 ("tipc: check msg->req data len in
> tipc_nl_compat_bearer_disable") the same patch code was copied into
> routines: tipc_nl_compat_bearer_disable(),
> tipc_nl_compat_link_stat_dump() and tipc_nl_compat_link_reset_stats().
> The two link routine occurrences should have been modified to check
> the maximum link name length and not bearer name length.
> 
> Fixes: 4f07b80c9733 ("tipc: check msg->reg data len in tipc_nl_compat_bearer_disable")
> Signed-off-by: John Rutherford <joh...@de...>
> ---
>  net/tipc/netlink_compat.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
> index e135d4e11231..d4d2928424e2 100644
> --- a/net/tipc/netlink_compat.c
> +++ b/net/tipc/netlink_compat.c
> @@ -550,7 +550,7 @@ static int tipc_nl_compat_link_stat_dump(struct tipc_nl_compat_msg *msg,
>  	if (len <= 0)
>  		return -EINVAL;
> 
> -	len = min_t(int, len, TIPC_MAX_BEARER_NAME);
> +	len = min_t(int, len, TIPC_MAX_LINK_NAME);
>  	if (!string_is_valid(name, len))
>  		return -EINVAL;
> 
> @@ -822,7 +822,7 @@ static int tipc_nl_compat_link_reset_stats(struct tipc_nl_compat_cmd_doit
> *cmd,
>  	if (len <= 0)
>  		return -EINVAL;
> 
> -	len = min_t(int, len, TIPC_MAX_BEARER_NAME);
> +	len = min_t(int, len, TIPC_MAX_LINK_NAME);
>  	if (!string_is_valid(name, len))
>  		return -EINVAL;
> 
> --
> 2.11.0
> 
> 
> 
> _______________________________________________
> tipc-discussion mailing list
> tip...@li...
> https://lists.sourceforge.net/lists/listinfo/tipc-discussion