nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'teor/bug18454'

Browse Source
This commit is contained in:
Nick Mathewson 2016-03-11 10:22:41 -05:00
commit 656e23171d
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changes/bug18454 Normal file
View File

@ -0,0 +1,8 @@
o Minor bugfixes (memory safety):
- Avoid freeing an uninitialised pointer when opening a socket fails
in get_interface_addresses_ioctl.
Fixes bug 18454; bugfix on 9f06ec0c in tor-0.2.3.11-alpha.
Reported by "toralf" and "cypherpunks", patch by "teor".
- Correctly duplicate addresses in get_interface_address6_list.
Fixes bug 18454; bugfix on 110765f5 in tor-0.2.8.1-alpha.
Reported by "toralf", patch by "cypherpunks".

6
src/common/address.c
View File

@ -1525,6 +1525,7 @@ get_interface_addresses_ioctl(int severity, sa_family_t family)
{
/* Some older unixy systems make us use ioctl(SIOCGIFCONF) */
struct ifconf ifc;
ifc.ifc_buf = NULL;
int fd;
smartlist_t *result = NULL;
@ -1547,7 +1548,6 @@ get_interface_addresses_ioctl(int severity, sa_family_t family)
}
int mult = 1;
ifc.ifc_buf = NULL;
do {
mult *= 2;
ifc.ifc_len = mult * IFREQ_SIZE;
@ -1790,7 +1790,7 @@ MOCK_IMPL(smartlist_t *,get_interface_address6_list,(int severity,
if (get_interface_address6_via_udp_socket_hack(severity,AF_INET,
&addr) == 0) {
if (include_internal || !tor_addr_is_internal(&addr, 0)) {
smartlist_add(addrs, tor_dup_addr(&addr));
smartlist_add(addrs, tor_memdup(&addr, sizeof(addr)));
}
}
}
@ -1799,7 +1799,7 @@ MOCK_IMPL(smartlist_t *,get_interface_address6_list,(int severity,
if (get_interface_address6_via_udp_socket_hack(severity,AF_INET6,
&addr) == 0) {
if (include_internal || !tor_addr_is_internal(&addr, 0)) {
smartlist_add(addrs, tor_dup_addr(&addr));
smartlist_add(addrs, tor_memdup(&addr, sizeof(addr)));
}
}
}