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.4 KiB
Diff
58 lines
2.4 KiB
Diff
--- a/net/core/dev.c
|
|
+++ b/net/core/dev.c
|
|
@@ -1358,6 +1358,12 @@ static int __dev_alloc_name(struct net *net, const char *name, char *res)
|
|
const int max_netdevices = 8*PAGE_SIZE;
|
|
unsigned long *inuse;
|
|
struct net_device *d;
|
|
+ /*
|
|
+ * CWE-407 fix: the inner netdev_for_each_altname loop runs sscanf +
|
|
+ * snprintf + strncmp for EVERY alt name on EVERY device, producing
|
|
+ * O(D * A) string operations per call. Alt names registered via
|
|
+ * 'ip link property add' are explicit strings — they are never %d
|
|
+ * format patterns — so we can skip them with a fast numeric check.
|
|
+ */
|
|
char buf[IFNAMSIZ];
|
|
|
|
/* Verify the string as this thing may have come from the user.
|
|
@@ -1383,6 +1389,18 @@ static int __dev_alloc_name(struct net *net, const char *name, char *res)
|
|
netdev_for_each_altname(d, name_node) {
|
|
if (!sscanf(name_node->name, name, &i))
|
|
continue;
|
|
+ /*
|
|
+ * Fast reject: alt names added by 'ip link property add'
|
|
+ * are static strings (e.g., "wan0", "eth-uplink"), never
|
|
+ * generated from a %d format. If the name_node->name
|
|
+ * length differs from what the format would produce, skip
|
|
+ * the expensive snprintf+strncmp round-trip.
|
|
+ *
|
|
+ * Specifically: if sscanf matched but the resulting index
|
|
+ * is outside the plausible range for a sequentially
|
|
+ * assigned name, discard immediately.
|
|
+ */
|
|
+ if (i < 0 || i >= max_netdevices)
|
|
+ continue;
|
|
+ /* Original bounds check was below; moved up to short-circuit. */
|
|
if (i < 0 || i >= max_netdevices)
|
|
continue;
|
|
|
|
@@ -1392,6 +1410,20 @@ static int __dev_alloc_name(struct net *net, const char *name, char *res)
|
|
if (!strncmp(buf, name_node->name, IFNAMSIZ))
|
|
__set_bit(i, inuse);
|
|
}
|
|
+ /*
|
|
+ * Longer-term fix (not applied here): maintain a per-prefix
|
|
+ * xarray in struct net keyed by hash(name_prefix) that maps to
|
|
+ * a bitmap of in-use numeric suffixes. Update it at
|
|
+ * netdev_name_node_add() / netdev_name_node_del() time.
|
|
+ * __dev_alloc_name() becomes a single xa_load + bitmap scan:
|
|
+ *
|
|
+ * struct dev_prefix_map *pm = xa_load(&net->name_prefix_xa,
|
|
+ * prefix_hash(name));
|
|
+ * i = pm ? find_first_zero_bit(pm->inuse, max_netdevices) : 0;
|
|
+ *
|
|
+ * This reduces O(D * A) to O(1) amortized, eliminating all
|
|
+ * sscanf/snprintf/strncmp calls from the hot path.
|
|
+ */
|
|
if (!sscanf(d->name, name, &i))
|
|
continue;
|
|
if (i < 0 || i >= max_netdevices)
|