Fix ip tree lookup on netmask content

Reed Morrison · Felipe Zimmerle · commit f66cd4111f08 · 2018-06-07T14:48:18.000-03:00
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,8 @@
 DD MMM YYYY - 2.9.3 - To be released
 ------------------------------------
 
+ * Fix ip tree lookup on netmask content
+   [Issue #1793 - @tinselcity, @zimmerle]
  * IIS: set overrideModeDefault to Allow so that individual websites can
    add <ModSecurity ...> to their web.config file
    [Issue #1781 - @default-kramer]
diff --git a/apache2/msc_tree.c b/apache2/msc_tree.c
@@ -755,7 +755,7 @@ TreeNode *CPTFindElement(modsec_rec *msr, unsigned char *ipdata, unsigned int ip
         return node;
     }
 
-    if (memcmp(node->prefix->buffer, temp_data, bytes) == 0) {
+    if ((node->netmasks == NULL) && (memcmp(node->prefix->buffer, temp_data, bytes) == 0)) {
         mask = SHIFT_LEFT_MASK(8 - ip_bitmask % 8);
 
         if ((ip_bitmask % 8) == 0) {

Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,7 @@ TreeNode CPTFindElement(modsec_rec msr, unsigned char *ipdata, unsigned int ip`
`755`	`755`	`return node;`
`756`	`756`	`}`
`757`	`757`
`758`		`- if (memcmp(node->prefix->buffer, temp_data, bytes) == 0) {`
	`758`	`+ if ((node->netmasks == NULL) && (memcmp(node->prefix->buffer, temp_data, bytes) == 0)) {`
`759`	`759`	`mask = SHIFT_LEFT_MASK(8 - ip_bitmask % 8);`
`760`	`760`
`761`	`761`	`if ((ip_bitmask % 8) == 0) {`