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
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From HEAD Mon Sep 17 00:00:00 2001
|
|
Subject: [PATCH] slabs: replace linear scan in slabs_clsid with binary search
|
|
|
|
CWE-407: slabs_clsid() walks the slabclass[] array linearly to find the
|
|
smallest class that fits a requested size. slabclass[] is sorted ascending
|
|
by size (guaranteed by slabs_init), so binary search applies.
|
|
|
|
With up to 63 slab classes (MAX_NUMBER_OF_SLAB_CLASSES-1) linear search
|
|
performs up to 63 comparisons; binary search performs at most 6 (⌈log₂63⌉).
|
|
|
|
slabs_clsid is called on every item allocation (do_item_alloc, do_item_alloc_chunk,
|
|
item_store_check) making it a hot path at high write throughput.
|
|
|
|
--- a/slabs.c
|
|
+++ b/slabs.c
|
|
@@ -77,12 +77,19 @@ unsigned int slabs_size(const int clsid) {
|
|
unsigned int slabs_clsid(const size_t size) {
|
|
- int res = POWER_SMALLEST;
|
|
-
|
|
if (size == 0 || size > settings.item_size_max)
|
|
return 0;
|
|
- while (size > slabclass[res].size)
|
|
- if (res++ == power_largest) /* won't fit in the biggest slab */
|
|
- return power_largest;
|
|
- return res;
|
|
+
|
|
+ /* CWE-407 fix: binary search over sorted slabclass[POWER_SMALLEST..power_largest].
|
|
+ * slabs_init guarantees strictly increasing .size values. */
|
|
+ int lo = POWER_SMALLEST, hi = power_largest;
|
|
+ while (lo < hi) {
|
|
+ int mid = lo + (hi - lo) / 2;
|
|
+ if (slabclass[mid].size < size)
|
|
+ lo = mid + 1;
|
|
+ else
|
|
+ hi = mid;
|
|
+ }
|
|
+ /* lo == hi == smallest class whose size >= requested size */
|
|
+ return lo;
|
|
}
|