sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix running with the seccomp2 sandbox 

We had a regression in 0.2.6.3-alpha when we stopped saying
IPPROTO_TCP to socket().  Fixes bug 14989, bugfix on 0.2.6.3-alpha.
This commit is contained in:
Nick Mathewson 2015-02-23 12:16:08 -05:00
parent 7a1a0a4cd7
commit f1fa85ea73
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug14989 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes (Linux seccomp2 sandbox):
- Pass IPPROTO_TCP rather than 0 to socket(), so that the
Linux seccomp2 sandbox doesn't fail. Fixes bug 14989;
bugfix on 0.2.6.3-alpha.

9
src/or/connection.c
View File

@ -1612,7 +1612,6 @@ connection_connect_sockaddr(connection_t *conn,
tor_socket_t s;
int inprogress = 0;
const or_options_t *options = get_options();
int protocol_family;
tor_assert(conn);
tor_assert(sa);
@ -1624,8 +1623,6 @@ connection_connect_sockaddr(connection_t *conn,
return -1;
}
protocol_family = sa->sa_family;
if (get_options()->DisableNetwork) {
/* We should never even try to connect anyplace if DisableNetwork is set.
* Warn if we do, and refuse to make the connection. */
@ -1637,7 +1634,11 @@ connection_connect_sockaddr(connection_t *conn,
return -1;
}
s = tor_open_socket_nonblocking(protocol_family, SOCK_STREAM, 0);
const int protocol_family = sa->sa_family;
const int proto = (sa->sa_family == AF_INET6 ||
sa->sa_family == AF_INET) ? IPPROTO_TCP : 0;
s = tor_open_socket_nonblocking(protocol_family, SOCK_STREAM, proto);
if (! SOCKET_OK(s)) {
*socket_error = tor_socket_errno(-1);
log_warn(LD_NET,"Error creating network socket: %s",