Re: [tipc-discussion] [PATCH] tipc: allow multicast address to be associated for RDM/DGRAM sockets

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

Looks ok with me. Was there something broken, or is it a new feature ?  I.e., should I send it to net or net-next ?

///jon


> -----Original Message-----
> From: eri...@gm... <eri...@gm...>
> Sent: 7-Mar-19 15:27
> To: tip...@li...; Jon Maloy
> <jon...@er...>; yin...@wi...
> Cc: Erik Hugne <eri...@gm...>
> Subject: [PATCH] tipc: allow multicast address to be associated for
> RDM/DGRAM sockets
> 
> From: Erik Hugne <eri...@gm...>
> 
> Perform the address type validation after we check if it's a connectionless
> socket, allowing TIPC_MULTICAST addresses to be associated with
> RDM/DGRAM sockets.
> ---
>  net/tipc/socket.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/net/tipc/socket.c b/net/tipc/socket.c index
> 3274ef625dba..dbfe12b07461 100644
> --- a/net/tipc/socket.c
> +++ b/net/tipc/socket.c
> @@ -2387,16 +2387,15 @@ static int tipc_connect(struct socket *sock, struct
> sockaddr *dest,
>  	} else if (dst->family != AF_TIPC) {
>  		res = -EINVAL;
>  	}
> -	if (dst->addrtype != TIPC_ADDR_ID && dst->addrtype !=
> TIPC_ADDR_NAME)
> -		res = -EINVAL;
> -	if (res)
> -		goto exit;
> -
>  	/* DGRAM/RDM connect(), just save the destaddr */
>  	if (tipc_sk_type_connectionless(sk)) {
>  		memcpy(&tsk->peer, dest, destlen);
>  		goto exit;
>  	}
> +	if (dst->addrtype != TIPC_ADDR_ID && dst->addrtype !=
> TIPC_ADDR_NAME)
> +		res = -EINVAL;
> +	if (res)
> +		goto exit;
> 
>  	previous = sk->sk_state;
> 
> --
> 2.14.1