From c77a48af6e1f38337b305fec794e8c999f1c7f3a Mon Sep 17 00:00:00 2001
From: Cheng Shao <terrorjack@type.dance>
Date: Mon, 27 May 2024 17:22:29 +0000
Subject: [PATCH] rts: fix an unaligned load in nonmoving gc
This patch fixes an unaligned load in nonmoving gc by ensuring the
closure address is properly untagged first before attempting to
prefetch its header. The unaligned load is reported by
UndefinedBehaviorSanitizer:
```
rts/sm/NonMovingMark.c:921:9: runtime error: member access within misaligned address 0x0042005f3a71 for type 'StgClosure' (aka 'struct StgClosure_'), which requires 8 byte alignment
0x0042005f3a71: note: pointer points here
00 00 00 98 43 13 8e 12 7f 00 00 50 3c 5f 00 42 00 00 00 58 17 b7 92 12 7f 00 00 89 cb 5e 00 42
^
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior rts/sm/NonMovingMark.c:921:9
```
This issue had previously gone unnoticed since it didn't really harm
runtime correctness, the invalid header address directly loaded from a
tagged pointer is only used as prefetch address and will not cause
segfaults. However, it still should be corrected because the prefetch
would be rendered useless by this issue, and untagging only involves a
single bitwise operation without memory access so it's cheap enough to
add.
---
rts/sm/NonMovingMark.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rts/sm/NonMovingMark.c b/rts/sm/NonMovingMark.c
index 8f3097ac07e..cddacb782dc 100644
--- a/rts/sm/NonMovingMark.c
+++ b/rts/sm/NonMovingMark.c
@@ -918,7 +918,7 @@ static MarkQueueEnt markQueuePop (MarkQueue *q)
// The entry may not be a MARK_CLOSURE but it doesn't matter, our
// MarkQueueEnt encoding always places the pointer to the object to be
// marked first.
- prefetchForRead(&new.mark_closure.p->header.info);
+ prefetchForRead(&(UNTAG_CLOSURE(new.mark_closure.p)->header.info));
#if !defined(ASSERTS_ENABLED)
prefetchForRead(Bdescr((StgPtr) new.mark_closure.p));
#endif
--
GitLab