root/ubuntu-post-install
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(kyber-linux): fix ___chkstk_ms link error in cmd shim

Browse Source 
Large stack array WCHAR[4096] triggered a stack probe (__chkstk_ms)
unavailable in -nostdlib builds. Fix: heap-allocate the pass-through
command line buffer, and add -mno-stack-arg-probe as a safety net.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01D8ckUJQtj1pH8jtAddBDZs
This commit is contained in:
Claude
2026-06-23 23:10:56 +00:00
parent 11d33efd04
commit da86b9a160
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/setup-kyber-linux.sh
+7 -3
View File
@@ -310,11 +310,14 @@ int WINAPI mainCRTStartup(void) {
} }
} }
/* pass-through to original cmd */ /* pass-through to original cmd */
WCHAR newcl[4096] = L"cmd-real.exe";
LPWSTR rest = GetCommandLineW(); LPWSTR rest = GetCommandLineW();
while (*rest && *rest != L' ') rest++; while (*rest && *rest != L' ') rest++;
if ((lstrlenW(newcl) + lstrlenW(rest)) < 4090) LPCWSTR prefix = L"cmd-real.exe";
lstrcatW(newcl, rest); int plen = lstrlenW(prefix), rlen = lstrlenW(rest);
LPWSTR newcl = (LPWSTR)HeapAlloc(GetProcessHeap(), 0,
(plen + rlen + 2) * sizeof(WCHAR));
lstrcpyW(newcl, prefix);
lstrcatW(newcl, rest);
STARTUPINFOW si = {sizeof(si)}; STARTUPINFOW si = {sizeof(si)};
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
CreateProcessW(NULL, newcl, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); CreateProcessW(NULL, newcl, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi);
@@ -326,6 +329,7 @@ int WINAPI mainCRTStartup(void) {
} }
CEOF CEOF
x86_64-w64-mingw32-gcc -O2 -ffreestanding -nostdlib \ x86_64-w64-mingw32-gcc -O2 -ffreestanding -nostdlib \
-mno-stack-arg-probe \
-e mainCRTStartup -o "$SHIM_EXE" "$SHIM_C" \ -e mainCRTStartup -o "$SHIM_EXE" "$SHIM_C" \
-lkernel32 -lshell32 \ -lkernel32 -lshell32 \
&& cp "$CMD_SHIM" "$CMD_REAL" \ && cp "$CMD_SHIM" "$CMD_REAL" \