fix: remove unused argument and add validation

Author: const-t

fw/http_match.c

@@ -91,7 +91,7 @@ map_op_to_str_eq_flags(tfw_http_match_op_t op)
 }
 
 bool
-tfw_match_regex(tfw_match_t op, const char *cstr, size_t len, const TfwStr *arg)
+tfw_match_regex(const char *cstr, const TfwStr *arg)
 {
         bool result;
         int r;
@@ -117,7 +117,7 @@ tfw_rule_str_match(const TfwStr *str, const char *cstr,
 					   cstr, cstr_len, flags);
 
 	if (op == TFW_HTTP_MATCH_O_REGEX)
-		return tfw_match_regex(op, cstr, cstr_len, str);
+		return tfw_match_regex(cstr, str);
 
 	return tfw_str_eq_cstr(str, cstr, cstr_len, flags);
 }
@@ -371,7 +371,7 @@ __cmp_hdr_raw_value(const TfwStr *chunk, const TfwStr *end, const TfwStr *hdr,
 		rhdr.chunks += cnum;
 		rhdr.nchunks -= cnum;
 		rhdr.len -= name_len;
-		return tfw_match_regex(rule->op, p_val, p_val_len, &rhdr);
+		return tfw_match_regex(p_val, &rhdr);
 	}
 
 	return __cmp_hdr_raw_value_str(chunk, end, p_val, p_val_len, flags,
@@ -830,8 +830,23 @@ write_regex(const char *arg)
 	int len = strlen(arg);
 	int len1;
 
-	if (len < sizeof(unsigned short)) {
-		T_ERR_NL("String of regex too short\n");
+	/*
+	 * Length of regexp string must be greater or equal to sizeof(number_of_regex)
+	 * because we use memory allocated for this string for storing id
+	 * of the regexp.
+	 */
+	if (len < sizeof(number_of_regex)) {
+		T_ERR_NL("String of regex too short.\n");
+		return -EINVAL;
+	}
+
+	if (number_of_db_regex == USHRT_MAX) {
+		T_ERR_NL("Maximum number of regular expression databases has been reached.\n");
+		return -EINVAL;
+	}
+
+	if (number_of_regex == USHRT_MAX) {
+		T_ERR_NL("Maximum number of regular expressions has been reached.\n");
 		return -EINVAL;
 	}
 

fw/http_match.h

@@ -173,8 +173,7 @@ int tfw_http_search_cookie(const char *cstr, unsigned long clen,
 
 int write_regex(const char *arg);
 
-bool tfw_match_regex(tfw_match_t op, const char *cstr, size_t len,
-                     const TfwStr *arg);
+bool tfw_match_regex(const char *cstr, const TfwStr *arg);
 
 #define tfw_http_chain_rules_for_each(chain, func)			\
 ({									\

fw/vhost.c

@@ -191,7 +191,7 @@ extern int bpf_scan_bytes(const void *, __u32, struct rex_scan_attr *);
 static bool
 __tfw_match_regex(tfw_match_t op, const char *cstr, size_t len, TfwStr *arg)
 {
-	return tfw_match_regex(op, cstr, len, arg);
+	return tfw_match_regex(cstr, arg);
 }
 
 typedef bool (*__tfw_match_fn)(tfw_match_t, const char *, size_t, TfwStr *);