Root Cause: - Phase 9 gutted hak_is_memory_readable() to always return 1 (unsafe!) - classify_ptr() Step 3 and free wrapper AllocHeader dispatch both relied on this - Result: SEGV when freeing external pointers (e.g. 0x5555... executable area) - Crash: hdr->magic dereference at unmapped memory (page boundary crossing) Fix (2-file, minimal patch): 1. core/box/front_gate_classifier.c (Line 211-230): - REMOVED unsafe AllocHeader probe from classify_ptr() - Return PTR_KIND_UNKNOWN immediately after registry lookups fail - Let free wrapper handle unknown pointers safely 2. core/box/hak_free_api.inc.h (Line 194-211): - RESTORED real mincore() check before AllocHeader dereference - Check BOTH pages if header crosses page boundary (40-byte header) - Only dereference hdr->magic if memory is verified mapped Verification: - ws=4096 benchmark: 10/10 runs passed (was: 100% crash) - Exit code: 0 (was: 139/SIGSEGV) - Crash location: eliminated (was: classify_ptr+298, hdr->magic read) Performance Impact: - Minimal (only affects unknown pointers, rare case) - mincore() syscall only when ptr NOT in Pool/SuperSlab registries Files Changed: - core/box/front_gate_classifier.c (+20 simplified, -30 unsafe) - core/box/hak_free_api.inc.h (+16 mincore check)
238 lines
7.8 KiB
C
238 lines
7.8 KiB
C
// front_gate_classifier.c - Box FG: Pointer Classification Implementation
|
|
|
|
// CRITICAL: Box FG requires header-based classification
|
|
// Ensure HEADER_MAGIC and HEADER_CLASS_MASK are available
|
|
#ifndef HAKMEM_TINY_HEADER_CLASSIDX
|
|
#define HAKMEM_TINY_HEADER_CLASSIDX 1
|
|
#endif
|
|
|
|
#include <stdio.h> // For fprintf in debug
|
|
#include <stdlib.h> // For abort in debug
|
|
#include <sys/mman.h> // For mincore() in Step 3 safety check
|
|
#include "front_gate_classifier.h"
|
|
#include "../tiny_region_id.h" // Must come before hakmem_tiny_superslab.h for HEADER_MAGIC
|
|
#include "../hakmem_tiny_superslab.h"
|
|
#include "../superslab/superslab_inline.h" // For ss_slabs_capacity
|
|
#include "../hakmem_build_flags.h"
|
|
#include "../hakmem_internal.h" // AllocHeader, HAKMEM_MAGIC, HEADER_SIZE, hak_is_memory_readable
|
|
#include "../hakmem_tiny_config.h" // For TINY_NUM_CLASSES, SLAB_SIZE
|
|
#include "../hakmem_super_registry.h" // For hak_super_lookup (Box REG)
|
|
|
|
#ifdef HAKMEM_POOL_TLS_PHASE1
|
|
#include "../pool_tls_registry.h" // Safer pool pointer lookup (no header deref)
|
|
#endif
|
|
|
|
// ========== Debug Stats ==========
|
|
|
|
#if !HAKMEM_BUILD_RELEASE
|
|
__thread uint64_t g_classify_header_hit = 0;
|
|
__thread uint64_t g_classify_headerless_hit = 0;
|
|
__thread uint64_t g_classify_pool_hit = 0;
|
|
__thread uint64_t g_classify_unknown_hit = 0;
|
|
|
|
void front_gate_print_stats(void) {
|
|
uint64_t total = g_classify_header_hit + g_classify_headerless_hit +
|
|
g_classify_pool_hit + g_classify_unknown_hit;
|
|
if (total == 0) return;
|
|
|
|
fprintf(stderr, "\n========== Front Gate Classification Stats ==========\n");
|
|
fprintf(stderr, "Header (C0-C6): %lu (%.2f%%)\n",
|
|
g_classify_header_hit, 100.0 * g_classify_header_hit / total);
|
|
fprintf(stderr, "Headerless (C7): %lu (%.2f%%)\n",
|
|
g_classify_headerless_hit, 100.0 * g_classify_headerless_hit / total);
|
|
fprintf(stderr, "Pool TLS: %lu (%.2f%%)\n",
|
|
g_classify_pool_hit, 100.0 * g_classify_pool_hit / total);
|
|
fprintf(stderr, "Unknown: %lu (%.2f%%)\n",
|
|
g_classify_unknown_hit, 100.0 * g_classify_unknown_hit / total);
|
|
fprintf(stderr, "Total: %lu\n", total);
|
|
fprintf(stderr, "======================================================\n");
|
|
}
|
|
|
|
static void __attribute__((destructor)) front_gate_stats_destructor(void) {
|
|
front_gate_print_stats();
|
|
}
|
|
#endif
|
|
|
|
// ========== Safe Header Probe ==========
|
|
|
|
// Try to read 1-byte header at ptr-1 (safe conditions only)
|
|
// Returns: class_idx (0-7) on success, -1 on failure
|
|
//
|
|
// Safety conditions:
|
|
// 1. Same page: (ptr & 0xFFF) >= 1 → header won't cross page boundary
|
|
// 2. Valid magic: (header & 0xF0) == HEADER_MAGIC (0xa0)
|
|
// 3. Valid class: class_idx in range [0, 7]
|
|
//
|
|
// Performance: 2-3 cycles (L1 cache hit)
|
|
static inline int safe_header_probe(void* ptr) {
|
|
// Reject obviously invalid/sentinel-sized pointers (defense-in-depth)
|
|
if ((uintptr_t)ptr < 4096) {
|
|
return -1;
|
|
}
|
|
// Safety check: header must be in same page as ptr
|
|
uintptr_t offset_in_page = (uintptr_t)ptr & 0xFFF;
|
|
if (offset_in_page == 0) {
|
|
// ptr is page-aligned → header would be on previous page (unsafe)
|
|
return -1;
|
|
}
|
|
|
|
// Safe to read header (same page guaranteed)
|
|
uint8_t* header_ptr = (uint8_t*)ptr - 1;
|
|
uint8_t header = *header_ptr;
|
|
|
|
// Validate magic
|
|
if ((header & 0xF0) != HEADER_MAGIC) {
|
|
return -1; // Not a Tiny header
|
|
}
|
|
|
|
// Extract class index
|
|
int class_idx = header & HEADER_CLASS_MASK;
|
|
|
|
// Phase E1-CORRECT: Validate class range (all classes 0-7 valid)
|
|
if (class_idx < 0 || class_idx >= TINY_NUM_CLASSES) {
|
|
return -1; // Invalid class
|
|
}
|
|
|
|
return class_idx;
|
|
}
|
|
|
|
// ========== Registry Lookup ==========
|
|
|
|
// Lookup pointer in SuperSlab registry (fallback when header probe fails)
|
|
// Returns: classification result with SuperSlab + class_idx + slab_idx
|
|
//
|
|
// Performance: 50-100 cycles (hash lookup + validation)
|
|
static inline ptr_classification_t registry_lookup(void* ptr) {
|
|
ptr_classification_t result = {
|
|
.kind = PTR_KIND_UNKNOWN,
|
|
.class_idx = -1,
|
|
.ss = NULL,
|
|
.slab_idx = -1
|
|
};
|
|
|
|
// Query SuperSlab registry
|
|
struct SuperSlab* ss = hak_super_lookup(ptr);
|
|
if (!ss || ss->magic != SUPERSLAB_MAGIC) {
|
|
// Not in Tiny registry
|
|
return result;
|
|
}
|
|
|
|
// Found SuperSlab - determine slab index from ptr-1 (block base)
|
|
result.ss = ss;
|
|
|
|
uintptr_t ptr_addr = (uintptr_t)ptr;
|
|
uintptr_t ss_addr = (uintptr_t)ss;
|
|
if (ptr_addr <= ss_addr) {
|
|
result.kind = PTR_KIND_UNKNOWN;
|
|
return result;
|
|
}
|
|
|
|
// Use block base for slab index to be consistent with free paths
|
|
uintptr_t base_addr = ptr_addr - 1;
|
|
size_t offset = base_addr - ss_addr;
|
|
int slab_idx = (int)(offset / SLAB_SIZE);
|
|
if (slab_idx < 0 || slab_idx >= ss_slabs_capacity(ss)) {
|
|
result.kind = PTR_KIND_UNKNOWN;
|
|
return result;
|
|
}
|
|
|
|
result.slab_idx = slab_idx;
|
|
TinySlabMeta* meta = &ss->slabs[slab_idx];
|
|
int cls = (meta->class_idx < TINY_NUM_CLASSES) ? (int)meta->class_idx : -1;
|
|
result.class_idx = cls;
|
|
|
|
if (cls == 7) {
|
|
// 1KB headerless tiny
|
|
result.kind = PTR_KIND_TINY_HEADERLESS;
|
|
} else if (cls >= 0) {
|
|
// Other tiny classes with 1-byte header
|
|
result.kind = PTR_KIND_TINY_HEADER;
|
|
} else {
|
|
result.kind = PTR_KIND_UNKNOWN;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
// ========== Pool TLS Probe ==========
|
|
|
|
#ifdef HAKMEM_POOL_TLS_PHASE1
|
|
// Registry-based Pool TLS probe (no memory deref)
|
|
static inline int is_pool_tls_reg(void* ptr) {
|
|
pid_t tid = 0; int cls = -1;
|
|
return pool_reg_lookup(ptr, &tid, &cls);
|
|
}
|
|
#endif
|
|
|
|
// ========== Front Gate Entry Point ==========
|
|
|
|
ptr_classification_t classify_ptr(void* ptr) {
|
|
ptr_classification_t result = {
|
|
.kind = PTR_KIND_UNKNOWN,
|
|
.class_idx = -1,
|
|
.ss = NULL,
|
|
.slab_idx = -1
|
|
};
|
|
|
|
if (!ptr) return result;
|
|
// Early guard: reject non-canonical tiny integers to avoid ptr-1 probe crashes
|
|
if ((uintptr_t)ptr < 4096) {
|
|
result.kind = PTR_KIND_UNKNOWN;
|
|
return result;
|
|
}
|
|
|
|
// Step 1: Check Pool TLS via registry (no pointer deref)
|
|
#ifdef HAKMEM_POOL_TLS_PHASE1
|
|
if (is_pool_tls_reg(ptr)) {
|
|
result.kind = PTR_KIND_POOL_TLS;
|
|
|
|
#if !HAKMEM_BUILD_RELEASE
|
|
g_classify_pool_hit++;
|
|
#endif
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
// Step 2: Registry lookup for Tiny (header or headerless)
|
|
result = registry_lookup(ptr);
|
|
if (result.kind == PTR_KIND_TINY_HEADERLESS) {
|
|
#if !HAKMEM_BUILD_RELEASE
|
|
g_classify_headerless_hit++;
|
|
#endif
|
|
return result;
|
|
}
|
|
if (result.kind == PTR_KIND_TINY_HEADER) {
|
|
#if !HAKMEM_BUILD_RELEASE
|
|
g_classify_header_hit++;
|
|
#endif
|
|
return result;
|
|
}
|
|
|
|
// Step 3: SAFETY FIX - Skip AllocHeader probe for unknown pointers
|
|
//
|
|
// RATIONALE:
|
|
// - If pointer isn't in Pool TLS or SuperSlab registries, it's either:
|
|
// 1. Mid/Large allocation (has AllocHeader)
|
|
// 2. External allocation (libc, stack, etc.)
|
|
// - We CANNOT safely distinguish (1) from (2) without dereferencing memory
|
|
// - Dereferencing unknown memory can SEGV (e.g., ptr at page boundary)
|
|
// - SAFER approach: Return UNKNOWN and let free wrapper handle it
|
|
//
|
|
// FREE WRAPPER BEHAVIOR (hak_free_api.inc.h):
|
|
// - PTR_KIND_UNKNOWN routes to Mid/Large registry lookups (hak_pool_mid_lookup, hak_l25_lookup)
|
|
// - If those fail → routes to AllocHeader dispatch (safe, same-page check)
|
|
// - If AllocHeader invalid → routes to __libc_free()
|
|
//
|
|
// PERFORMANCE IMPACT:
|
|
// - Only affects pointers NOT in our registries (rare)
|
|
// - Avoids SEGV on external pointers (correctness > performance)
|
|
//
|
|
result.kind = PTR_KIND_UNKNOWN;
|
|
|
|
#if !HAKMEM_BUILD_RELEASE
|
|
g_classify_unknown_hit++;
|
|
#endif
|
|
|
|
return result;
|
|
}
|