Skip to content

fix: thread-unsafe global state in id.c #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
flyingrobots merged 1 commit into from
Jun 24, 2025
Merged

fix: thread-unsafe global state in id.c #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
CC ?= gcc
CFLAGS = -Wall -Wextra -Werror -std=gnu11 -O2
CFLAGS += -I./include
LDFLAGS = -lsodium
LDFLAGS = -lsodium -lpthread

# Coverage settings
COVERAGE ?= 0
Expand Down Expand Up @@ -75,7 +75,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c
test: dirs $(ALL_OBJS)
$(CC) $(CFLAGS) $(TEST_ERROR) $(ERROR_OBJS) -o $(BIN_DIR)/test_error $(LDFLAGS)
$(CC) $(CFLAGS) $(TEST_ID) $(TYPES_OBJS) $(CRYPTO_OBJS) $(UTF8_OBJS) $(ERROR_OBJS) -o $(BIN_DIR)/test_id $(LDFLAGS)
$(CC) $(CFLAGS) $(TEST_ID_THREAD_SAFETY) $(TYPES_OBJS) $(CRYPTO_OBJS) $(UTF8_OBJS) $(ERROR_OBJS) -o $(BIN_DIR)/test_id_thread_safety $(LDFLAGS) -lpthread
$(CC) $(CFLAGS) $(TEST_ID_THREAD_SAFETY) $(TYPES_OBJS) $(CRYPTO_OBJS) $(UTF8_OBJS) $(ERROR_OBJS) -o $(BIN_DIR)/test_id_thread_safety $(LDFLAGS)
$(CC) $(CFLAGS) $(TEST_STRING) $(TYPES_OBJS) $(CRYPTO_OBJS) $(UTF8_OBJS) $(ERROR_OBJS) -o $(BIN_DIR)/test_string $(LDFLAGS)
$(CC) $(CFLAGS) $(TEST_PATH) $(TYPES_OBJS) $(CRYPTO_OBJS) $(UTF8_OBJS) $(ERROR_OBJS) -o $(BIN_DIR)/test_path $(LDFLAGS)
$(CC) $(CFLAGS) $(TEST_SHA256) $(CRYPTO_OBJS) $(ERROR_OBJS) -o $(BIN_DIR)/test_sha256 $(LDFLAGS)
Expand Down
40 changes: 16 additions & 24 deletions core/src/types/id.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "gitmind/error.h"
#include "gitmind/security/memory.h"

#include <pthread.h>
#include <sodium.h>
#include <stdbool.h>
#include <stdio.h>
Expand All @@ -25,35 +26,26 @@ int gm_id_compare(gm_id_t id_a, gm_id_t id_b) {

/* SipHash key - initialized once at startup */
static uint8_t g_siphash_key[crypto_shorthash_siphash24_KEYBYTES];
static bool g_siphash_key_initialized = false;

/* Initialize SipHash key with random data */
static void ensure_siphash_key_initialized(void) {
if (!g_siphash_key_initialized) {
/* Generate random key - this is best effort, if it fails we use zeros
*/
gm_result_void result =
gm_random_bytes(g_siphash_key, sizeof(g_siphash_key));
if (GM_IS_ERR(result)) {
/* If random generation fails, use a deterministic fallback */
/* This is still better than hardcoded constant */
for (size_t i = 0; i < sizeof(g_siphash_key); i++) {
g_siphash_key[i] = (uint8_t)(i ^ 0xAA);
}
static pthread_once_t g_siphash_key_once = PTHREAD_ONCE_INIT;

/* Initialize SipHash key with random data - called once by pthread_once */
static void init_siphash_key(void) {
/* Generate random key - this is best effort, if it fails we use fallback */
gm_result_void result =
gm_random_bytes(g_siphash_key, sizeof(g_siphash_key));
if (GM_IS_ERR(result)) {
/* If random generation fails, use a deterministic fallback */
/* This is still better than hardcoded constant */
for (size_t i = 0; i < sizeof(g_siphash_key); i++) {
g_siphash_key[i] = (uint8_t)(i ^ 0xAA);
}
g_siphash_key_initialized = true;
gm_error_free(GM_UNWRAP_ERR(result));
}
}
/* Hash function for hash tables using SipHash-2-4 */
gm_result_u32 gm_id_hash(gm_id_t identifier) {
/* Ensure key is initialized - this can fail if random generation fails */
ensure_siphash_key_initialized();

/* Check if initialization actually succeeded */
if (!g_siphash_key_initialized) {
return gm_err_u32(
GM_ERROR(GM_ERR_INVALID_STATE, "Failed to initialize SipHash key"));
}
/* Ensure key is initialized exactly once, thread-safe */
pthread_once(&g_siphash_key_once, init_siphash_key);

/* SipHash produces 8-byte output */
uint8_t hash_output[crypto_shorthash_siphash24_BYTES];
Expand Down