torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport r17887: stop accepting 1.2.3 as a valid IPv4 address. This has security implications.

Browse Source 
svn:r18419
This commit is contained in:
Nick Mathewson
2009-02-09 03:12:02 +00:00
parent 248805262d
commit 4c7a884129
3 changed files with 12 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2
View File
@@ -10,6 +10,8 @@ Changes in version 0.2.0.34 - 2009-02-08
Patch from Matthias Drochner.
- Don't consider expiring already-closed client connections. Fixes
bug 893. Bugfix on 0.0.2pre20.
- Do not accept incomplete ipv4 addresses (like 192.168.0) as valid.
Spec conformance issue. Bugfix on Tor 0.0.2pre27.
Changes in version 0.2.0.33 - 2009-01-21
src/common/compat.c
+9 -21
View File
@@ -115,12 +115,6 @@ const char compat_c_id[] =
#include "strlcat.c"
#endif
#ifndef INADDR_NONE
/* This is used by inet_addr, but apparently Solaris doesn't define it
* anyplace. */
#define INADDR_NONE ((unsigned long) -1)
#endif
#ifdef HAVE_SYS_MMAN_H
/** Implementation for tor_mmap_t: holds the regular tor_mmap_t, along
* with extra fields needed for mmap()-based memory mapping. */
@@ -1169,24 +1163,18 @@ get_user_homedir(const char *username)
* but works on Windows and Solaris.)
*/
int
tor_inet_aton(const char *c, struct in_addr* addr)
tor_inet_aton(const char *str, struct in_addr* addr)
{
#ifdef HAVE_INET_ATON
return inet_aton(c, addr);
#else
uint32_t r;
tor_assert(c);
tor_assert(addr);
if (strcmp(c, "255.255.255.255") == 0) {
addr->s_addr = 0xFFFFFFFFu;
return 1;
}
r = inet_addr(c);
if (r == INADDR_NONE)
int a,b,c,d;
char more;
if (sscanf(str, "%d.%d.%d.%d%c", &a,&b,&c,&d,&more) != 4)
return 0;
addr->s_addr = r;
if (a < 0 || a > 255) return 0;
if (b < 0 || b > 255) return 0;
if (c < 0 || c > 255) return 0;
if (d < 0 || d > 255) return 0;
addr->s_addr = htonl((a<<24) | (b<<16) | (c<<8) | d);
return 1;
#endif
}
/** Given <b>af</b>==AF_INET and <b>src</b> a struct in_addr, or
src/or/eventdns.c
+1 -14
View File
@@ -357,20 +357,7 @@ error_is_eagain(int err)
{
return err == EAGAIN || err == WSAEWOULDBLOCK;
}
static int
inet_aton(const char *c, struct in_addr *addr)
{
uint32_t r;
if (strcmp(c, "255.255.255.255") == 0) {
addr->s_addr = 0xffffffffu;
} else {
r = inet_addr(c);
if (r == INADDR_NONE)
return 0;
addr->s_addr = r;
}
return 1;
}
#define inet_aton(c, addr) tor_inet_aton((c), (addr))
#define CLOSE_SOCKET(x) closesocket(x)
#else
#define last_error(sock) (errno)