The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=f6ee1d20d36813e9906916f48cf06f44a2fd668d
commit f6ee1d20d36813e9906916f48cf06f44a2fd668d Author: Jessica Clarke <[email protected]> AuthorDate: 2026-07-13 03:03:03 +0000 Commit: Jessica Clarke <[email protected]> CommitDate: 2026-07-13 03:03:03 +0000 kern_thread: Fix i386 p_emuldata KBI assertion On amd64 there was 4 bytes of padding between the 20-byte p_comm and (for LP64) 8-byte p_sysent, so the addition of p_execblock just caused that padding to be eaten up. However, on i386, there was no such padding, and so the addition of p_execblock rippled through to p_emuldata. Fixes: e1a84b7708c2 ("execve_block(): a mechanism for mutual exclusion with execve() on the process") --- sys/kern/kern_thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 28c6dcff0ceb..ebfbfa159c5a 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -122,7 +122,7 @@ _Static_assert(offsetof(struct proc, p_filemon) == 0x270, "struct proc KBI p_filemon"); _Static_assert(offsetof(struct proc, p_comm) == 0x288, "struct proc KBI p_comm"); -_Static_assert(offsetof(struct proc, p_emuldata) == 0x318, +_Static_assert(offsetof(struct proc, p_emuldata) == 0x31c, "struct proc KBI p_emuldata"); #endif
