tipc: Simplify enforcement of reserved name type prohibition

Streamlines the logic that prevents an application from binding a
reserved TIPC name type to a port by moving the check to the code
that handles a socket bind() operation. This allows internal TIPC
subsystems to bind a reserved name without having to set an atomic
flag to gain permission to use such a name. (This simplification is
now possible due to the elimination of support for TIPC's native API.)

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index e2f7c5d370ba..d3227f2a216e 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -355,6 +355,9 @@ static int bind(struct socket *sock, struct sockaddr *uaddr, int uaddr_len)
         else if (addr->addrtype != TIPC_ADDR_NAMESEQ)
                 return -EAFNOSUPPORT;
 
+        if (addr->addr.nameseq.type < TIPC_RESERVED_TYPES)
+                return -EACCES;
+
         return (addr->scope > 0) ?
                 tipc_publish(portref, addr->scope, &addr->addr.nameseq) :
                 tipc_withdraw(portref, -addr->scope, &addr->addr.nameseq);