Fix a few more issues found by Coverity.

[oweals/tinc.git] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 5a7c6065ef830d68b5ca2694f50a9e4559e79108..60335fd08df50955cc243f54217de043a6143d05 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -165,23 +165,25 @@ static bool read_rsa_private_key(void) {
        char *fname, *key, *pubkey;
 
        if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key)) {
-               if(!get_config_string(lookup_config(config_tree, "PublicKey"), &pubkey)) {
-                       logger(LOG_ERR, "PrivateKey used but no PublicKey found!");
-                       return false;
-               }
                myself->connection->rsa_key = RSA_new();
 //             RSA_blinding_on(myself->connection->rsa_key, NULL);
                if(BN_hex2bn(&myself->connection->rsa_key->d, key) != strlen(key)) {
                        logger(LOG_ERR, "Invalid PrivateKey for myself!");
+                       free(key);
+                       return false;
+               }
+               free(key);
+               if(!get_config_string(lookup_config(config_tree, "PublicKey"), &pubkey)) {
+                       logger(LOG_ERR, "PrivateKey used but no PublicKey found!");
                        return false;
                }
                if(BN_hex2bn(&myself->connection->rsa_key->n, pubkey) != strlen(pubkey)) {
                        logger(LOG_ERR, "Invalid PublicKey for myself!");
+                       free(pubkey);
                        return false;
                }
-               BN_hex2bn(&myself->connection->rsa_key->e, "FFFF");
-               free(key);
                free(pubkey);
+               BN_hex2bn(&myself->connection->rsa_key->e, "FFFF");
                return true;
        }
 
@@ -200,15 +202,12 @@ static bool read_rsa_private_key(void) {
 #if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
        struct stat s;
 
-       if(fstat(fileno(fp), &s)) {
-               logger(LOG_ERR, "Could not stat RSA private key file `%s': %s'",
-                               fname, strerror(errno));
-               free(fname);
-               return false;
+       if(!fstat(fileno(fp), &s)) {
+               if(s.st_mode & ~0100700)
+                       logger(LOG_WARNING, "Warning: insecure file permissions for RSA private key file `%s'!", fname);
+       } else {
+               logger(LOG_WARNING, "Could not stat RSA private key file `%s': %s'", fname, strerror(errno));
        }
-
-       if(s.st_mode & ~0100700)
-               logger(LOG_WARNING, "Warning: insecure file permissions for RSA private key file `%s'!", fname);
 #endif
 
        myself->connection->rsa_key = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
@@ -295,17 +294,20 @@ char *get_name(void) {
 
        if(*name == '$') {
                char *envname = getenv(name + 1);
+               char hostname[32] = "";
                if(!envname) {
                        if(strcmp(name + 1, "HOST")) {
                                fprintf(stderr, "Invalid Name: environment variable %s does not exist\n", name + 1);
+                               free(name);
                                return false;
                        }
-                       char envname[32];
-                       if(gethostname(envname, 32)) {
+                       if(gethostname(hostname, sizeof hostname) || !*hostname) {
                                fprintf(stderr, "Could not get hostname: %s\n", strerror(errno));
+                               free(name);
                                return false;
                        }
-                       envname[31] = 0;
+                       hostname[31] = 0;
+                       envname = hostname;
                }
                free(name);
                name = xstrdup(envname);
@@ -334,11 +336,12 @@ static bool setup_myself(void) {
        char *address = NULL;
        char *proxy = NULL;
        char *space;
-       char *envp[5];
+       char *envp[5] = {NULL};
        struct addrinfo *ai, *aip, hint = {0};
        bool choice;
        int i, err;
        int replaywin_int;
+       bool port_specified = false;
 
        myself = new_node();
        myself->connection = new_connection();
@@ -354,6 +357,8 @@ static bool setup_myself(void) {
                return false;
        }
 
+       /* Read tinc.conf and our own host config file */
+
        myself->name = name;
        myself->connection->name = xstrdup(name);
        xasprintf(&fname, "%s/hosts/%s", confbase, name);
@@ -366,6 +371,10 @@ static bool setup_myself(void) {
 
        if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
                myport = xstrdup("655");
+       else
+               port_specified = true;
+
+       /* Ensure myport is numeric */
 
        if(!atoi(myport)) {
                struct addrinfo *ai = str2addrinfo("localhost", myport, SOCK_DGRAM);
@@ -377,8 +386,7 @@ static bool setup_myself(void) {
                sockaddr2str(&sa, NULL, &myport);
        }
 
-       get_config_string(lookup_config(config_tree, "Proxy"), &proxy);
-       if(proxy) {
+       if(get_config_string(lookup_config(config_tree, "Proxy"), &proxy)) {
                if((space = strchr(proxy, ' ')))
                        *space++ = 0;
 
@@ -570,6 +578,7 @@ static bool setup_myself(void) {
                        addressfamily = AF_UNSPEC;
                else {
                        logger(LOG_ERR, "Invalid address family!");
+                       free(afname);
                        return false;
                }
                free(afname);
@@ -579,8 +588,7 @@ static bool setup_myself(void) {
 
        /* Generate packet encryption key */
 
-       if(get_config_string
-          (lookup_config(config_tree, "Cipher"), &cipher)) {
+       if(get_config_string(lookup_config(config_tree, "Cipher"), &cipher)) {
                if(!strcasecmp(cipher, "none")) {
                        myself->incipher = NULL;
                } else {
@@ -588,9 +596,11 @@ static bool setup_myself(void) {
 
                        if(!myself->incipher) {
                                logger(LOG_ERR, "Unrecognized cipher type!");
+                               free(cipher);
                                return false;
                        }
                }
+               free(cipher);
        } else
                myself->incipher = EVP_bf_cbc();
 
@@ -616,9 +626,12 @@ static bool setup_myself(void) {
 
                        if(!myself->indigest) {
                                logger(LOG_ERR, "Unrecognized digest type!");
+                               free(digest);
                                return false;
                        }
                }
+
+               free(digest);
        } else
                myself->indigest = EVP_sha1();
 
@@ -682,6 +695,7 @@ static bool setup_myself(void) {
                else if(!strcasecmp(type, "vde"))
                        devops = vde_devops;
 #endif
+               free(type);
        }
 
        if(!devops.setup())
@@ -692,11 +706,10 @@ static bool setup_myself(void) {
        xasprintf(&envp[1], "DEVICE=%s", device ? : "");
        xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
        xasprintf(&envp[3], "NAME=%s", myself->name);
-       envp[4] = NULL;
 
        execute_script("tinc-up", envp);
 
-       for(i = 0; i < 5; i++)
+       for(i = 0; i < 4; i++)
                free(envp[i]);
 
        /* Run subnet-up scripts for our own subnets */
@@ -812,13 +825,27 @@ static bool setup_myself(void) {
                } while(cfg);
        }
 
-       if(listen_sockets)
-               logger(LOG_NOTICE, "Ready");
-       else {
+       if(!listen_sockets) {
                logger(LOG_ERR, "Unable to create any listening socket!");
                return false;
        }
 
+       /* If no Port option was specified, set myport to the port used by the first listening socket. */
+
+       if(!port_specified) {
+               sockaddr_t sa;
+               socklen_t salen = sizeof sa;
+               if(!getsockname(listen_socket[0].udp, &sa.sa, &salen)) {
+                       free(myport);
+                       sockaddr2str(&sa, NULL, &myport);
+                       if(!myport)
+                               myport = xstrdup("655");
+               }
+       }
+
+       /* Done. */
+
+       logger(LOG_NOTICE, "Ready");
        return true;
 }
 
@@ -862,7 +889,7 @@ bool setup_network(void) {
 void close_network_connections(void) {
        avl_node_t *node, *next;
        connection_t *c;
-       char *envp[5];
+       char *envp[5] = {NULL};
        int i;
 
        for(node = connection_tree->head; node; node = next) {
@@ -896,7 +923,6 @@ void close_network_connections(void) {
        xasprintf(&envp[1], "DEVICE=%s", device ? : "");
        xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
        xasprintf(&envp[3], "NAME=%s", myself->name);
-       envp[4] = NULL;
 
        exit_requests();
        exit_edges();