Commit graph

2000 commits

Author SHA1 Message Date
thorkill
1391b2d7dc Added -Werror=unused-parameter
In system.h UNUSED() macro has been defined which can be used to mark unsed parameters.
2015-07-02 18:35:57 +02:00
thorkill
50da19addf Removed unused variables.
Found using clang -Wunused-variable
2015-07-02 18:03:03 +02:00
thorkill
656af8fa07 Remove conflicting function definitions
- send_request
- send_meta
2015-07-02 17:51:46 +02:00
thorkill
9b3ff33dba Added missing function prototypes
Found by clang -Wmissing-prototypes
2015-07-02 17:43:51 +02:00
thorkill
78397eda9b Added extra check for edge->from and edge->to in edge_add
edge_add() and edge_del() assume, that from and to are always set.
This was triggered while working on cmocka test.
2015-07-02 00:02:05 +02:00
thorkill
536256b2da Added support for cmocka *alloc 2015-07-01 19:04:22 +02:00
thorkill
dca3558d05 Leave a notice in the log when aborting 2015-07-01 19:01:42 +02:00
thorkill
24cea32efb Fix memory leak in splay_delete_tree
Use splay_delete_node to properly decrease counters and release memory.
2015-07-01 16:57:05 +02:00
thorkill
faef01317b Do not free splay_tree when tree->count != 0 2015-07-01 16:56:07 +02:00
thorkill
278cd4d856 Added missing libchacha_poly1305 while linking sptps_* tools
- should work on gentoo and Arch Linux - AUR
2015-07-01 13:54:57 +02:00
thorkill
905572863c Added support for darwin
Darwin does not have -lrt
2015-07-01 11:18:29 +02:00
thorkill
fbb62fa80e Make proper checks in configure
now compiles with gcc 5.1.0
2015-06-30 23:20:31 +02:00
thorkill
c3f8a93d52 Define variables in getopt.h 2015-06-30 22:50:29 +02:00
thorkill
82300c623d Make sptps_speed and sptps_test compile
TODO: tests do not work
2015-06-30 22:49:11 +02:00
thorkill
4bfa726f8b Cleanup src/Makefile.am
Make it compile on FreeBSD
2015-06-30 22:48:15 +02:00
thorkill
f8154e3012 Initialize values in tincctl.c 2015-06-30 19:51:19 +02:00
thorkill
6a6113b366 Initialize variables in info.c 2015-06-30 19:48:49 +02:00
thorkill
84d34f4f35 Initialize variables in invitation.c 2015-06-30 19:46:14 +02:00
thorkill
8fb52e05f3 Define g_argv as static 2015-06-30 19:44:35 +02:00
thorkill
de9f04c30e Initialize variables in linux/device.c 2015-06-30 19:42:37 +02:00
thorkill
fb2942a249 Initialize result 2015-06-30 19:40:33 +02:00
thorkill
7a61acabea Added hash_t definitions 2015-06-30 19:39:11 +02:00
thorkill
9e0c77e21f Initialize variables in splay_tree.c - splay_top_down() 2015-06-30 19:35:13 +02:00
thorkill
044fc684d0 Initialize variables in route.c 2015-06-30 19:33:22 +02:00
thorkill
6b3b90a7b1 Initialize variables in protocol_subnet.c 2015-06-30 19:29:44 +02:00
thorkill
932dc76f43 Initialize variables in protocol_edge.c 2015-06-30 19:28:11 +02:00
thorkill
fb1a8fd631 Initialize variables in protocol.c 2015-06-30 19:26:42 +02:00
thorkill
0bd116195a Initialize variables in node.c 2015-06-30 19:24:27 +02:00
thorkill
d803ac93dc Initialize variables in netutl.c 2015-06-30 19:23:15 +02:00
thorkill
e2245da720 Initialize addrinfo hint 2015-06-30 19:20:57 +02:00
thorkill
94b9723917 Initialize sock 2015-06-30 19:19:30 +02:00
thorkill
c17cb1a0f2 Proper initialization of subnet 2015-06-30 19:15:43 +02:00
thorkill
7ed725888b Do not exit on unused-parameters 2015-06-30 19:15:22 +02:00
thorkill
78be3b19de Fixed signal_t initialization 2015-06-30 19:14:54 +02:00
thorkill
8f5a59a027 Included missing names.h 2015-06-30 19:11:45 +02:00
thorkill
3dc9542ec2 Disable -fno-strict-overflow and enable some -Werror= 2015-06-30 19:06:17 +02:00
thorkill
daf99058e3 Moved few config parameters to make lib usage possible. 2015-06-30 18:43:37 +02:00
thorkill
6633bf52e3 First working version 2015-06-30 18:36:57 +02:00
thorkill
6d9853618a Working on libs 2015-06-30 18:36:46 +02:00
thorkill
6b62992c25 Revert "Silence most noisy sources of memory leakage."
This reverts commit 408fb3b011.
2015-06-30 18:10:38 +02:00
thorkill
c53a9719d5 Revert "s_errno was nerver used"
This reverts commit 157ee90568.
2015-06-30 18:10:23 +02:00
thorkill
d661be413f Revert "Proper variable initialization"
This reverts commit bf91a8a340.
2015-06-30 18:10:20 +02:00
thorkill
54b8bc6e86 Revert "Type mismatch and debug_t is always >= 0"
This reverts commit 62dc7b6fe5.
2015-06-30 18:10:18 +02:00
thorkill
8a39621c64 Revert "make usage of function parameters"
This reverts commit 8108b0d5eb.
2015-06-30 18:10:16 +02:00
thorkill
f5f35bd148 Revert "initialize variables used in conditional jumps"
This reverts commit f89b38947a.
2015-06-30 18:10:10 +02:00
thorkill
104017df7a Revert "Added UNUSED macro to silnce unused-parameter warnings"
This reverts commit 8d4b974dda.
2015-06-30 18:10:07 +02:00
thorkill
c68aa9d5cc Revert "explicit middle parameter definition"
This reverts commit 0ef605d864.
2015-06-30 18:10:05 +02:00
thorkill
ce7b019067 Revert "Added type casting from debug_t to int"
This reverts commit 3bfb343b85.
2015-06-30 18:10:02 +02:00
thorkill
d7c623b8c7 Revert "Changed int size into size_t"
This reverts commit f755d57f4e.
2015-06-30 18:10:00 +02:00
thorkill
5dac5eb451 Revert "Marked unused parameters"
This reverts commit 3a61d104d4.
2015-06-30 18:09:50 +02:00
thorkill
3eb3cc7898 Revert "Type casting fixes"
This reverts commit dbfc168fa4.
2015-06-30 18:09:17 +02:00
thorkill
01098e2078 Revert "Fixing implicit conversion changes to signedness"
This reverts commit 7099a4437e.
2015-06-30 18:09:11 +02:00
thorkill
4f82a6359f Revert "Proper struct initialization"
This reverts commit bc8dbfc9fd.
2015-06-30 18:09:07 +02:00
thorkill
84ede57e52 Revert "fixed initialization of pollfd"
This reverts commit 319e0ac8ce.
2015-06-30 18:09:02 +02:00
thorkill
fe99eb02df Revert "Still hunting down uninitialized variables"
This reverts commit 46b9578cad.
2015-06-30 18:08:31 +02:00
thorkill
46b9578cad Still hunting down uninitialized variables 2015-06-30 02:04:16 +02:00
thorkill
319e0ac8ce fixed initialization of pollfd 2015-06-29 23:40:33 +02:00
thorkill
bc8dbfc9fd Proper struct initialization
Detected by clang -Wmissing-field-initializers
2015-06-29 23:32:34 +02:00
thorkill
7099a4437e Fixing implicit conversion changes to signedness
- format string
- function parameters
- logging
2015-06-29 23:32:26 +02:00
thorkill
dbfc168fa4 Type casting fixes 2015-06-29 16:19:23 +02:00
thorkill
3a61d104d4 Marked unused parameters 2015-06-29 16:19:19 +02:00
thorkill
f755d57f4e Changed int size into size_t 2015-06-29 16:19:15 +02:00
thorkill
3bfb343b85 Added type casting from debug_t to int 2015-06-29 16:19:11 +02:00
thorkill
0ef605d864 explicit middle parameter definition
error: use of GNU ?: conditional expression extension, omitting middle operand [-Werror,-Wgnu-conditional-omitted-operand]
2015-06-29 16:19:03 +02:00
thorkill
8d4b974dda Added UNUSED macro to silnce unused-parameter warnings 2015-06-29 16:18:52 +02:00
thorkill
f89b38947a initialize variables used in conditional jumps
Errors detected by clang -Wconditional-uninitialized.
2015-06-29 16:18:39 +02:00
thorkill
8108b0d5eb make usage of function parameters 2015-06-29 16:18:30 +02:00
thorkill
62dc7b6fe5 Type mismatch and debug_t is always >= 0
- Proper function definitions
2015-06-29 16:18:20 +02:00
thorkill
bf91a8a340 Proper variable initialization 2015-06-29 16:18:11 +02:00
thorkill
157ee90568 s_errno was nerver used 2015-06-29 16:18:02 +02:00
thorkill
da1a77998c Removed double break; 2015-06-29 16:17:53 +02:00
thorkill
408fb3b011 Silence most noisy sources of memory leakage.
==27135== Use of uninitialised value of size 8
==27135==    at 0x57BE17B: BN_num_bits_word (in /usr/lib/libcrypto.so.1.0.0)
==27135==    by 0x57BE205: BN_num_bits (in /usr/lib/libcrypto.so.1.0.0)
==27135==    by 0x57BADF7: BN_div (in /usr/lib/libcrypto.so.1.0.0)
==27135==    by 0x57C48FC: BN_mod_inverse (in /usr/lib/libcrypto.so.1.0.0)
==27135==    by 0x57C3647: BN_BLINDING_create_param (in /usr/lib/libcrypto.so.1.0.0)
==27135==    by 0x5812D44: RSA_setup_blinding (in /usr/lib/libcrypto.so.1.0.0)
==27135==    by 0x58095CB: rsa_get_blinding (in /usr/lib/libcrypto.so.1.0.0)
==27135==    by 0x580A64F: RSA_eay_private_decrypt (in /usr/lib/libcrypto.so.1.0.0)
==27135==    by 0x4E5D9BC: rsa_private_decrypt (rsa.c:97)
==27135==    by 0x4E51E1B: metakey_h (protocol_auth.c:524)
==27135==    by 0x4E505FD: receive_request (protocol.c:136)
==27135==    by 0x4E46002: receive_meta (meta.c:290)
==27135==  Uninitialised value was created by a heap allocation
==27135==    at 0x4C29F90: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==27135==    by 0x575DCD7: CRYPTO_malloc (in /usr/lib/libcrypto.so.1.0.0)
==27135==    by 0x57C24E1: BN_rand (in /usr/lib/libcrypto.so.1.0.0)
==27135==    by 0x57C216F: bn_rand_range (in /usr/lib/libcrypto.so.1.0.0)
==27135==    by 0x57C3630: BN_BLINDING_create_param (in /usr/lib/libcrypto.so.1.0.0)
==27135==    by 0x5812D44: RSA_setup_blinding (in /usr/lib/libcrypto.so.1.0.0)
==27135==    by 0x58095CB: rsa_get_blinding (in /usr/lib/libcrypto.so.1.0.0)
==27135==    by 0x580A64F: RSA_eay_private_decrypt (in /usr/lib/libcrypto.so.1.0.0)
==27135==    by 0x4E5D9BC: rsa_private_decrypt (rsa.c:97)
==27135==    by 0x4E51E1B: metakey_h (protocol_auth.c:524)
==27135==    by 0x4E505FD: receive_request (protocol.c:136)
==27135==    by 0x4E46002: receive_meta (meta.c:290)
2015-06-28 00:40:31 +02:00
Etienne Dechamps
7aca0be0f9 Protect against callbacks removing items from the io tree.
The definition of the splay_each() macro is somewhat complicated for
syntactic reasons. Here's what it does in a more readable way:

  for (splay_node_t* node = tree->head; node;) {
    type* item = node->data;
    splay_node_t* next = node->next;

    // RUN USER BLOCK with (item)

    node = next;
  }

list_each() works in the same way. Since node->next is saved before the
user block runs, this construct supports removing the current item from
within the user block. However, what it does *not* support is removing
*other items* from within the user block, especially the next item.
Indeed, that will invalide the next pointer in the above loop and
therefore result in an invalid pointer dereference.

Unfortunately, there is at least one code path where that unsupported
operation happens. It is located in ack_h(), where the authentication
protocol code detects a double connection (i.e. being connected to
another node twice). Running in the context of a socket read event, this
code will happily terminate the *other* metaconnection, resulting in its
socket being removed from the io tree. If, by misfortune, this other
metaconnection happened to have the next socket FD number (which is
quite possible due to FD reuse - albeit unlikely), and was part of the
io tree (which is quite likely because if that connection is stuck, it
will most likely have pending writes) then this will result in the next
pending io item being destroyed. Invalid pointer dereference ensues.

I did a quick audit of other uses of splay_each() and list_each() and
I believe this is the only scenario in which this "next pointer
invalidation" problem can occur in practice. While this bug has been
there since at least 6bc5d626a8 (November
2012), if not sooner, it happens quite rarely due to the very specific
set of conditions required to trigger it. Nevertheless, it does manage
to crash my central production nodes every other week or so.
2015-06-26 20:11:31 +02:00
Guus Sliepen
d150e82b94 Fix crash is sptps_logger().
Unfortunately, sptps_logger() cannot know if s->handle is pointing to a
connection_t or a node_t. But it needs to print name and hostname in
both cases. So make sure both types have name and hostname fields at the
start with the same offset.
2015-06-26 20:11:31 +02:00
Guus Sliepen
8960694e51 Fix alignment of output of sptps_speed. 2015-06-26 20:11:31 +02:00
Guus Sliepen
06a7c60db7 Fix receiving SPTPS data in sptps_speed and sptps_test.
The sptps_receive_data() was changed in commit d237efd to only process
one SPTPS record from a stream input. So now we have to put a loop
around it to ensure we process everything.
2015-06-26 20:11:30 +02:00
Guus Sliepen
479a10b484 Fix warnings about missing return value checks.
In some harmless places, checks for the return value of ECDSA and RSA
key generation and verification was omitted. Add them to keep the
compiler happy and to warn end users in case something is wrong.
2015-06-26 20:11:30 +02:00
thorkill
8e3edeec3d Reverted error messages to original one 2015-06-26 17:13:52 +02:00
Etienne Dechamps
ebffa40aa7 Protect against callbacks removing items from the io tree.
The definition of the splay_each() macro is somewhat complicated for
syntactic reasons. Here's what it does in a more readable way:

  for (splay_node_t* node = tree->head; node;) {
    type* item = node->data;
    splay_node_t* next = node->next;

    // RUN USER BLOCK with (item)

    node = next;
  }

list_each() works in the same way. Since node->next is saved before the
user block runs, this construct supports removing the current item from
within the user block. However, what it does *not* support is removing
*other items* from within the user block, especially the next item.
Indeed, that will invalide the next pointer in the above loop and
therefore result in an invalid pointer dereference.

Unfortunately, there is at least one code path where that unsupported
operation happens. It is located in ack_h(), where the authentication
protocol code detects a double connection (i.e. being connected to
another node twice). Running in the context of a socket read event, this
code will happily terminate the *other* metaconnection, resulting in its
socket being removed from the io tree. If, by misfortune, this other
metaconnection happened to have the next socket FD number (which is
quite possible due to FD reuse - albeit unlikely), and was part of the
io tree (which is quite likely because if that connection is stuck, it
will most likely have pending writes) then this will result in the next
pending io item being destroyed. Invalid pointer dereference ensues.

I did a quick audit of other uses of splay_each() and list_each() and
I believe this is the only scenario in which this "next pointer
invalidation" problem can occur in practice. While this bug has been
there since at least 6bc5d626a8 (November
2012), if not sooner, it happens quite rarely due to the very specific
set of conditions required to trigger it. Nevertheless, it does manage
to crash my central production nodes every other week or so.
2015-06-20 14:09:00 +01:00
Guus Sliepen
45a46f068c Fix crash is sptps_logger().
Unfortunately, sptps_logger() cannot know if s->handle is pointing to a
connection_t or a node_t. But it needs to print name and hostname in
both cases. So make sure both types have name and hostname fields at the
start with the same offset.
2015-06-10 23:42:17 +02:00
thorkill
7941f68ab0 removed debug output in sptps.c 2015-06-08 13:03:41 +02:00
Guus Sliepen
bfe231b977 Fix alignment of output of sptps_speed. 2015-06-07 23:20:14 +02:00
Guus Sliepen
a797b4a192 Fix receiving SPTPS data in sptps_speed and sptps_test.
The sptps_receive_data() was changed in commit d237efd to only process
one SPTPS record from a stream input. So now we have to put a loop
around it to ensure we process everything.
2015-06-07 23:17:54 +02:00
Guus Sliepen
d8d1ab4ee1 Fix warnings about missing return value checks.
In some harmless places, checks for the return value of ECDSA and RSA
key generation and verification was omitted. Add them to keep the
compiler happy and to warn end users in case something is wrong.
2015-06-07 22:50:05 +02:00
thorkill
e0221cc00d Merge branch '1.1' of github.com:gsliepen/tinc into thkr-1.1-ponyhof 2015-06-06 01:50:28 +02:00
Guus Sliepen
84ecc972e5 Fix missing return value caused by the previous commit. 2015-05-31 23:51:39 +02:00
Etienne Dechamps
eca357ed91 Don't try to relay packets to unreachable nodes.
It is not unusual for tinc to receive SPTPS packets to be relayed to
nodes that just became unreachable, due to state propagation delays in
the metagraph.

Unfortunately, the current code doesn't handle that situation correctly,
and still tries to relay the packet to the unreachable node. This
typically ends up segfaulting.

This commit fixes the issue by checking for reachability before relaying
the packet.
2015-05-31 20:19:48 +01:00
thorkill
9bf36c8666 Merge branch '1.1' of github.com:gsliepen/tinc into thkr-1.1-ponyhof 2015-05-26 12:57:15 +02:00
Etienne Dechamps
9e3adef5cb Fix invalid pointer use in get_my_hostname().
clang-3.7 warnings surfaced an actual bug:

invitation.c:185:5: error: address of array 'filename' will always evaluate to 'true'
      [-Werror,-Wpointer-bool-conversion]
        if(filename) {
        ~~ ^~~~~~~~

The regression was introduced in 3ccdf50beb.
2015-05-24 09:49:16 +01:00
Etienne Dechamps
7fcfbe2bd2 Fix wrong format string type in send_sptps_tcppacket().
This issue was found through a clang-3.7 warning:

protocol_misc.c:167:46: error: format specifies type 'short' but the argument has type 'int'
      [-Werror,-Wformat]
        if(!send_request(c, "%d %hd", SPTPS_PACKET, len))
                                ~~~                 ^~~
                                %d
2015-05-24 09:45:09 +01:00
Etienne Dechamps
3e61c7233b Don't set up an ongoing connection to myself.
It is entirely possible that the configuration file could contain a
ConnectTo statement refering to its own name; that's a reasonable
scenario when one deploys semi-automatically generated tinc.conf files.

Amusingly, tinc does not like that at all, and actually sets up an
outgoing_t structure to myself (which obviously makes no sense). This is
mostly benign, though it does result in non-sensical "Already connected
to myself" messages every retry interval.

However, that also makes things blow up in close_network_connections(),
because there we delete the entire outgoing list and *then* the myself
node, which still has a reference to the freshly deleted outgoing
structure. Boom.
2015-05-23 17:33:32 +01:00
Etienne Dechamps
8587e8c0d9 Fix crashes when trying unreachable nodes.
timeout_handler() calls try_tx(c->node) when c->edge exists.
Unfortunately, the existence of c->edge is not enough to conclude that
the node is reachable.

In fact, during connection establishment, there is a short period of
time where we create an edge for the node at the other end of the
metaconnection, but we don't have one from the other side yet.
Unfortunately, if timeout_handler() runs during that short time
window, it will call try_tx() on an unreachable node, which makes
things explode because that function is not prepared to handle that
case.

A typical symptom of this race condition is a hard SEGFAULT while trying
to send packets using metaconnections that don't exist, due to
n->nexthop containing garbage.

This patch fixes the issue by making try_tx() check for reachability,
and then making all code paths use try_tx() instead of the more
specialized methods so that they go through the check.

This regression was introduced in
eb7a0db18e.
2015-05-23 10:24:00 +01:00
Guus Sliepen
537a936671 Update copyright notices. 2015-05-21 11:09:01 +02:00
Guus Sliepen
0a786ffbb9 Set the CLOEXEC flag on the umbilical socket. 2015-05-21 11:06:38 +02:00
Guus Sliepen
87e0952773 Use socketpair() instead of pipe() for the umbilical.
This prepares for a possible conversion of the umbilical socket to a
control socket.
2015-05-20 21:28:54 +02:00
Guus Sliepen
19e0d449eb Don't write log messages to the umbilical pipe if we don't detach.
If we run in the foreground and are started by the CLI, this would
otherwise cause the first few log messages to appear twice.
2015-05-20 21:25:06 +02:00
Guus Sliepen
11868b890d Ensure "tinc start" knows if the daemon really started succesfully.
We do this by creating an umbilical between the CLI and the daemon. The
daemon pipes log messages to the CLI until it starts the main loop. The
daemon then cuts the umbilical. The CLI copies all the received log
messages to stderr, and the last byte indicates whether the daemon
started succesfully or not, so the CLI can exit with a useful exit code.
2015-05-20 16:59:43 +02:00
thorkill
26c7ff7fdd fixed conflict in src/sptps.c 2015-05-20 14:34:10 +02:00
Guus Sliepen
7f96ef081d Fix check for LOCALSTATEDIR accessibility for the CLI.
The CLI does not need write access to the directory where the PID file
is stored, it just needs to be able to read the PID file.
2015-05-20 11:11:12 +02:00
Guus Sliepen
3ccdf50beb Allocate temporary filenames on the stack.
This gets rid of xasprintf() in a number of places, and removes the need
to free() the temporary strings. A few potential memory leaks have been
fixed.
2015-05-20 00:58:00 +02:00