Fix #16: Resolve double BASE→USER conversion causing header corruption
🎯 ROOT CAUSE: Internal allocation helpers were prematurely converting BASE → USER pointers before returning to caller. The caller then applied HAK_RET_ALLOC/tiny_region_id_write_header which performed ANOTHER BASE→USER conversion, resulting in double offset (BASE+2) and header written at wrong location. 📦 BOX THEORY SOLUTION: Establish clean pointer conversion boundary at tiny_region_id_write_header, making it the single source of truth for BASE → USER conversion. 🔧 CHANGES: - Fix #16: Remove premature BASE→USER conversions (6 locations) * core/tiny_alloc_fast.inc.h (3 fixes) * core/hakmem_tiny_refill.inc.h (2 fixes) * core/hakmem_tiny_fastcache.inc.h (1 fix) - Fix #12: Add header validation in tls_sll_pop (detect corruption) - Fix #14: Defense-in-depth header restoration in tls_sll_splice - Fix #15: USER pointer detection (for debugging) - Fix #13: Bump window header restoration - Fix #2, #6, #7, #8: Various header restoration & NULL termination 🧪 TEST RESULTS: 100% SUCCESS - 10K-500K iterations: All passed - 8 seeds × 100K: All passed (42,123,456,789,999,314,271,161) - Performance: ~630K ops/s average (stable) - Header corruption: ZERO 📋 FIXES SUMMARY: Fix #1-8: Initial header restoration & chain fixes (chatgpt-san) Fix #9-10: USER pointer auto-fix (later disabled) Fix #12: Validation system (caught corruption at call 14209) Fix #13: Bump window header writes Fix #14: Splice defense-in-depth Fix #15: USER pointer detection (debugging tool) Fix #16: Double conversion fix (FINAL SOLUTION) ✅ 🎓 LESSONS LEARNED: 1. Validation catches bugs early (Fix #12 was critical) 2. Class-specific inline logging reveals patterns (Option C) 3. Box Theory provides clean architectural boundaries 4. Multiple investigation approaches (Task/chatgpt-san collaboration) 📄 DOCUMENTATION: - P0_BUG_STATUS.md: Complete bug tracking timeline - C2_CORRUPTION_ROOT_CAUSE_FINAL.md: Detailed root cause analysis - FINAL_ANALYSIS_C2_CORRUPTION.md: Investigation methodology 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> Co-Authored-By: Task Agent <task@anthropic.com> Co-Authored-By: ChatGPT <chatgpt@openai.com>
This commit is contained in:
@ -11,6 +11,8 @@
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
#include "hakmem_build_flags.h"
|
||||
#include "tiny_box_geometry.h"
|
||||
#include "ptr_track.h"
|
||||
|
||||
// Feature flag: Enable header-based class_idx lookup
|
||||
#ifndef HAKMEM_TINY_HEADER_CLASSIDX
|
||||
@ -55,7 +57,17 @@ static inline void* tiny_region_id_write_header(void* base, int class_idx) {
|
||||
// Write header at block start
|
||||
uint8_t* header_ptr = (uint8_t*)base;
|
||||
*header_ptr = HEADER_MAGIC | (class_idx & HEADER_CLASS_MASK);
|
||||
return header_ptr + 1; // skip header for user pointer
|
||||
PTR_TRACK_HEADER_WRITE(base, HEADER_MAGIC | (class_idx & HEADER_CLASS_MASK));
|
||||
void* user = header_ptr + 1; // skip header for user pointer
|
||||
PTR_TRACK_MALLOC(base, 0, class_idx); // Track at BASE (where header is)
|
||||
// Optional guard: log stride/base/user for targeted class
|
||||
extern int tiny_guard_is_enabled(void);
|
||||
extern void tiny_guard_on_alloc(int cls, void* base, void* user, size_t stride);
|
||||
if (tiny_guard_is_enabled()) {
|
||||
size_t stride = tiny_stride_for_class(class_idx);
|
||||
tiny_guard_on_alloc(class_idx, base, user, stride);
|
||||
}
|
||||
return user;
|
||||
}
|
||||
|
||||
// ========== Read Header (Free) ==========
|
||||
@ -100,6 +112,9 @@ static inline int tiny_region_id_read_header(void* ptr) {
|
||||
invalid_count++;
|
||||
}
|
||||
#endif
|
||||
// Optional guard hook for invalid header
|
||||
extern void tiny_guard_on_invalid(void* user_ptr, uint8_t hdr);
|
||||
if (tiny_guard_is_enabled()) tiny_guard_on_invalid(ptr, header);
|
||||
return -1;
|
||||
}
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user