russell@unturf.com
9934133dcf
Add 88 new defect entries to HIGH and MEDIUM tables:
HIGH: mysql-0001/0002, mariadb-0001, redis-0001/0002, valkey-0001/0002, openvpn-0001,
vlc-0001, prometheus-0001, otel-collector-0001, cockroachdb-0001..0004,
tidb-0001..0008, kubernetes-0001/0002, go-0001, kotlin-0002, scala-0001,
allegro5-0001, sdl2-0001, grafana-0001, clickhouse-0001, duckdb-0001,
mongodb-0001, envoy-0001, istio-0001, cilium-0001, linkerd2-0001,
linux-0001/0002/0003, tor-0002/0003, curl-0001, julia-0001, lua-0001,
perl5-0001, nats-0001, spring-0003/0004, tomcat-0001, onos-0002, odl-0002
MEDIUM: helm-0001, mariadb-0002, openssl-0001/0002, memcached-0001,
cassandra-0001..0004, flink-0001, storm-0001/0002, zookeeper-0001..0003,
pip-0001, gradle-0001, nginx-0001, haproxy-0001, caddy-0001, varnish-0001,
ffmpeg-0001, gstreamer-0001, raylib-0001, love2d-0001, php-0001/0002,
r-source-0001, cpython-0002, ruby-0001, rabbitmq-0003/0004, activemq-0001,
ovs-0001, onos-0003, odl-0002, jetty-0001
PDF: 976K
58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
--- a/src/pattern.c
|
|
+++ b/src/pattern.c
|
|
@@ -552,36 +552,43 @@ struct pattern *pat_match_bin(struct sample *smp, struct pattern_expr *expr, int fill)
|
|
{
|
|
struct pattern_list *lst;
|
|
struct pattern *pattern;
|
|
struct pattern *ret = NULL;
|
|
struct lru64 *lru = NULL;
|
|
|
|
- if (pat_lru_tree && !LIST_ISEMPTY(&expr->patterns) && expr->ref->entry_cnt >= 20) {
|
|
+ /*
|
|
+ * CWE-407 fix: lower LRU activation threshold from 20 to 1.
|
|
+ * With threshold=20 every ACL with <20 binary patterns performed a full
|
|
+ * O(P) list walk per request. The LRU cache is cheap to consult even
|
|
+ * for a single entry; consulting it at entry_cnt >= 1 eliminates the
|
|
+ * per-request list walk for any previously-seen value.
|
|
+ */
|
|
+ if (pat_lru_tree && !LIST_ISEMPTY(&expr->patterns) && expr->ref->entry_cnt >= 1) {
|
|
unsigned long long seed = pat_lru_seed ^ (long)expr;
|
|
|
|
lru = lru64_get(XXH3(smp->data.u.str.area, smp->data.u.str.data, seed),
|
|
pat_lru_tree, expr, expr->ref->revision);
|
|
if (lru && lru->domain) {
|
|
ret = lru->data;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
list_for_each_entry(lst, &expr->patterns, list) {
|
|
pattern = &lst->pat;
|
|
|
|
if (pattern->ref->gen_id != expr->ref->curr_gen)
|
|
continue;
|
|
|
|
if (pattern->len != smp->data.u.str.data)
|
|
continue;
|
|
|
|
if (memcmp(pattern->ptr.str, smp->data.u.str.area, smp->data.u.str.data) == 0) {
|
|
ret = pattern;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (lru)
|
|
lru64_commit(lru, ret, expr, expr->ref->revision, NULL);
|
|
|
|
return ret;
|
|
}
|
|
|
|
@@ -730,6 +737,7 @@ struct pattern *pat_match_end(struct sample *smp, struct pattern_expr *expr, int fill)
|
|
if (pat_lru_tree && !LIST_ISEMPTY(&expr->patterns) && expr->ref->entry_cnt >= 20) {
|
|
+ /* CWE-407 fix: same threshold reduction for pat_match_end */
|
|
+ if (pat_lru_tree && !LIST_ISEMPTY(&expr->patterns) && expr->ref->entry_cnt >= 1) {
|
|
|
|
@@ -786,6 +794,7 @@ struct pattern *pat_match_sub(struct sample *smp, struct pattern_expr *expr, int fill)
|
|
if (pat_lru_tree && !LIST_ISEMPTY(&expr->patterns) && expr->ref->entry_cnt >= 20) {
|
|
+ /* CWE-407 fix: same threshold reduction for pat_match_sub */
|
|
+ if (pat_lru_tree && !LIST_ISEMPTY(&expr->patterns) && expr->ref->entry_cnt >= 1) {
|