tipc: allow service ranges to be connect()'ed on RDM/DGRAM
Subsystems (3)
PATCH v2 1/1 tipc: allow service ranges to be connect()'ed on RDM/DGRAM
From: Erik Hugne <[email protected]>
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.
---
v2: address check function returns bool as suggested by davem
--- net/tipc/socket.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
net/tipc/socket.c +15 -5
@@ -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;
Signature · 1 line
2.1.4
David Miller
maintainerFrom: Jon Maloy <[email protected]>
Date: Sun, 17 Mar 2019 18:46:42 +0100
Quoted 11 lines
From: Erik Hugne <[email protected]>
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 23998835be98 ("tipc: improve address sanity check in tipc_connect()")Signed-off-by Erik Hugne <[email protected]>Signed-off-by Jon Maloy <[email protected]>---
v2: address check function returns bool as suggested by davem
Applied and queued up for -stable, thanks Jon.