github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-15 23:55:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix inet addr handling on 64 bit big endian systems

Browse Source 
Back port from v3. @zimmerle.
This commit is contained in:
Ervin Hegedus 2018-12-09 20:26:40 +00:00 committed by Felipe Zimmerle
parent cb33bb4faa
commit 0dcbb8b087
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apache2/msc_tree.c
View File

@ -832,7 +832,7 @@ TreeNode *TreeAddIP(const char *buffer, CPTTree *tree, int type) {
switch(type) { switch(type) {
case IPV4_TREE: case IPV4_TREE:
memset(&addr4, 0, sizeof(addr4)); memset(&(addr4.s_addr), 0, sizeof(addr4.s_addr));
memset(ip_strv4, 0x0, NETMASK_32); memset(ip_strv4, 0x0, NETMASK_32);
strncpy(ip_strv4, buffer, sizeof(ip_strv4)); strncpy(ip_strv4, buffer, sizeof(ip_strv4));
@ -859,20 +859,16 @@ TreeNode *TreeAddIP(const char *buffer, CPTTree *tree, int type) {
ip_strv4[pos] = '\0'; ip_strv4[pos] = '\0';
} }
ret = inet_pton(AF_INET, ip_strv4, &addr4); ret = inet_pton(AF_INET, ip_strv4, &(addr4.s_addr));
if (ret <= 0) { if (ret <= 0) {
return NULL; return NULL;
} }
ip = addr4.s_addr;
tree->count++; tree->count++;
return CPTAddElement((unsigned char *)&(addr4.s_addr), NETMASK_32, tree, netmask_v4);
return CPTAddElement((unsigned char *)&ip, NETMASK_32, tree, netmask_v4);
case IPV6_TREE: case IPV6_TREE:
memset(&addr6, 0, sizeof(addr6)); memset(&(addr6.s6_addr), 0, sizeof(addr6.s6_addr));
memset(ip_strv6, 0x0, NETMASK_128); memset(ip_strv6, 0x0, NETMASK_128);
strncpy(ip_strv6, buffer, sizeof(ip_strv6)); strncpy(ip_strv6, buffer, sizeof(ip_strv6));
@ -899,7 +895,7 @@ TreeNode *TreeAddIP(const char *buffer, CPTTree *tree, int type) {
ip_strv6[pos] = '\0'; ip_strv6[pos] = '\0';
} }
ret = inet_pton(AF_INET6, ip_strv6, &addr6); ret = inet_pton(AF_INET6, ip_strv6, &(addr6.s6_addr));
if (ret <= 0) if (ret <= 0)
{ {
@ -908,10 +904,11 @@ TreeNode *TreeAddIP(const char *buffer, CPTTree *tree, int type) {
tree->count++; tree->count++;
return CPTAddElement((unsigned char *)&addr6.s6_addr, NETMASK_128, tree, netmask_v6); return CPTAddElement((unsigned char *)&(addr6.s6_addr), NETMASK_128, tree, netmask_v6);
default: default:
return NULL; return NULL;
} }
return NULL; return NULL;
} }

8
apache2/msc_util.c
View File

@ -2712,26 +2712,26 @@ int tree_contains_ip(apr_pool_t *mp, TreeRoot *rtree,
} }
if (strchr(value, ':') == NULL) { if (strchr(value, ':') == NULL) {
if (inet_pton(AF_INET, value, &in) <= 0) { if (inet_pton(AF_INET, value, &(in.s_addr)) <= 0) {
*error_msg = apr_psprintf(mp, "IPmatch: bad IPv4 " \ *error_msg = apr_psprintf(mp, "IPmatch: bad IPv4 " \
"specification \"%s\".", value); "specification \"%s\".", value);
return -1; return -1;
} }
if (CPTIpMatch(msr, (unsigned char *)&in.s_addr, rtree->ipv4_tree, if (CPTIpMatch(msr, (unsigned char *)&(in.s_addr), rtree->ipv4_tree,
IPV4_TREE) != NULL) { IPV4_TREE) != NULL) {
return 1; return 1;
} }
} }
#if APR_HAVE_IPV6 #if APR_HAVE_IPV6
else { else {
if (inet_pton(AF_INET6, value, &in6) <= 0) { if (inet_pton(AF_INET6, value, &(in6.s6_addr)) <= 0) {
*error_msg = apr_psprintf(mp, "IPmatch: bad IPv6 " \ *error_msg = apr_psprintf(mp, "IPmatch: bad IPv6 " \
"specification \"%s\".", value); "specification \"%s\".", value);
return -1; return -1;
} }
if (CPTIpMatch(msr, (unsigned char *)&in6.s6_addr, rtree->ipv6_tree, if (CPTIpMatch(msr, (unsigned char *)&(in6.s6_addr), rtree->ipv6_tree,
IPV6_TREE) != NULL) { IPV6_TREE) != NULL) {
return 1; return 1;
} }