Commit ea239314 authored by Erik Hugne's avatar Erik Hugne Committed by David S. Miller
Browse files

tipc: allow service ranges to be connect()'ed on RDM/DGRAM 



We move the check that prevents connecting service ranges to after
the RDM/DGRAM check, and move address sanity control to a separate
function that also validates the service range.

Fixes: 23998835 ("tipc: improve address sanity check in tipc_connect()")
Signed-off-by: default avatarErik Hugne <erik.hugne@gmail.com>
Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 65e9a6d2

net/tipc/socket.c

+15 −5
Original line number Diff line number Diff line
@@ -2349,6 +2349,16 @@ static int tipc_wait_for_connect(struct socket *sock, long *timeo_p) 
	return 0;

}



static bool tipc_sockaddr_is_sane(struct sockaddr_tipc *addr)

{

	if (addr->family != AF_TIPC)

		return false;

	if (addr->addrtype == TIPC_SERVICE_RANGE)

		return (addr->addr.nameseq.lower <= addr->addr.nameseq.upper);

	return (addr->addrtype == TIPC_SERVICE_ADDR ||

		addr->addrtype == TIPC_SOCKET_ADDR);

}



/**

 * tipc_connect - establish a connection to another TIPC port

 * @sock: socket structure
@@ -2384,18 +2394,18 @@ static int tipc_connect(struct socket *sock, struct sockaddr *dest, 
		if (!tipc_sk_type_connectionless(sk))

			res = -EINVAL;

		goto exit;

	} else if (dst->family != AF_TIPC) {

		res = -EINVAL;

	}

	if (dst->addrtype != TIPC_ADDR_ID && dst->addrtype != TIPC_ADDR_NAME)

	if (!tipc_sockaddr_is_sane(dst)) {

		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;

	} else if (dst->addrtype == TIPC_SERVICE_RANGE) {

		res = -EINVAL;

		goto exit;

	}



	previous = sk->sk_state;

CRA Git | Maintained and supported by SUSTech CRA and CCSE