Skip to contentSkip to conversation

arm64: fix padding computation in struct ucontext

PATCH New Andreas Schwab 2 participants 2 messages Feb 26, 2013 – Feb 27, 2013 arm64

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: fix padding computation in struct ucontext

The expression to compute the padding needed to fill the uc_sigmask field to 1024 bits actually computes the padding needed for 1080 bits. Fortunately, due to the 16-byte alignment of the following field (uc_mcontext) the definition in glibc contains enough bytes of padding after uc_sigmask so that the overall offsets and size match in both definitions.

---
 arch/arm64/include/asm/ucontext.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/include/asm/ucontext.h +1 -1
index bde9607..42e04c8 100644
@@ -22,7 +22,7 @@ struct ucontext {
 	stack_t		  uc_stack;
 	sigset_t	  uc_sigmask;
 	/* glibc uses a 1024-bit sigset_t */
-	__u8		  __unused[(1024 - sizeof(sigset_t)) / 8];
+	__u8		  __unused[1024 / 8 - sizeof(sigset_t)];
 	/* last for future expansion */
 	struct sigcontext uc_mcontext;
 };
Signature · 7 lines
1.8.1.4


-- 
Andreas Schwab, SUSE Labs, schwab at suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
maintainer
#1 lore raw

PATCH 1/1 arm64: fix padding computation in struct ucontext

Quoted 8 lines · Andreas Schwab

The expression to compute the padding needed to fill the uc_sigmask field to 1024 bits actually computes the padding needed for 1080 bits. Fortunately, due to the 16-byte alignment of the following field (uc_mcontext) the definition in glibc contains enough bytes of padding after uc_sigmask so that the overall offsets and size match in both definitions.

It looks like I messed the bits vs bytes. Luckily we have the 16-byte alignment of the last element in ucontext. I'll send the patch upstream.

Thanks.

Signature · 1 line
Catalin