From ecc202ac078d5cb5c61d60268fce5ac46bac1e87 Mon Sep 17 00:00:00 2001 From: Onur Gündüz Date: Wed, 17 Jun 2026 00:41:54 +0200 Subject: cpu: reject negative current capacity in grow_cap --- src/alloc.c | 15 ++++++++------- tests/test_workspace.c | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/alloc.c b/src/alloc.c index e3b82d7..41a59a4 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -4,9 +4,10 @@ #include #include -/* Sequence-capacity growth policy for the forward-pass workspaces: never - * allocate fewer than the minimum, and round up to the granularity so small - * length changes do not trigger a realloc on every call. */ +/* Sequence-capacity growth policy for the forward-pass workspaces: for new + * growth, never allocate fewer than the minimum, and round up to the + * granularity so small length changes do not trigger a realloc on every call. + * Existing larger capacity is preserved. */ #define EMBED_MIN_WORKSPACE_SEQ_CAP 16 #define EMBED_WORKSPACE_SEQ_GRANULARITY 16 @@ -25,7 +26,7 @@ int add_size(size_t a, size_t b, size_t *out) { } int grow_cap(int current, int needed, int *out) { - if (needed <= 0) + if (current < 0 || needed <= 0) return -1; int cap = needed; @@ -34,10 +35,10 @@ int grow_cap(int current, int needed, int *out) { int rem = cap % EMBED_WORKSPACE_SEQ_GRANULARITY; if (rem != 0) { - int add = EMBED_WORKSPACE_SEQ_GRANULARITY - rem; - if (cap > INT_MAX - add) + int pad = EMBED_WORKSPACE_SEQ_GRANULARITY - rem; + if (cap > INT_MAX - pad) return -1; - cap += add; + cap += pad; } if (cap < current) diff --git a/tests/test_workspace.c b/tests/test_workspace.c index c8b6ee8..64b7404 100644 --- a/tests/test_workspace.c +++ b/tests/test_workspace.c @@ -8,6 +8,8 @@ #include "tiny_model.h" #include "tok_fixture.h" +#include "../src/alloc.h" + #include #include #include @@ -24,6 +26,23 @@ static float max_abs_diff(const float *a, const float *b, int n) { return m; } +static int check_alloc_helpers(void) { + int cap = 0; + if (grow_cap(-1, 1, &cap) == 0) { + fprintf(stderr, "grow_cap accepted a negative current capacity\n"); + return -1; + } + if (grow_cap(33, 17, &cap) != 0 || cap != 33) { + fprintf(stderr, "grow_cap failed to preserve a larger current capacity\n"); + return -1; + } + if (grow_cap(0, 17, &cap) != 0 || cap != 32) { + fprintf(stderr, "grow_cap failed to round new capacity to granularity\n"); + return -1; + } + return 0; +} + /* The allocating and pooling API variants must agree with the *_into * results validated in main. reference is the batched row for ids0. */ static int check_alloc_and_pooling_variants(const embed_model_t *model, @@ -161,6 +180,9 @@ done: } int main(int argc, char **argv) { + if (check_alloc_helpers() != 0) + return 1; + char fixture_dir[1024]; const char *model_dir; if (argc == 2) { -- cgit v1.3.1