oysteikt/heimdal
0
0
Fork 0
Code Issues 4 Pull Requests Releases Activity

asn1: fix open type alignment on ILP32

Browse Source 
Do not assume that the open-type payload needs 8-byte alignment.
Align to pointer size instead, which avoids reading the wrong location
on ILP32 layouts.
This commit is contained in:
Roland C. Dowdeswell
2026-06-10 13:19:51 +01:00
committed by Nico Williams
parent 9bb80f4747
commit 34ab0b7c77
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/asn1/template.c
+4 -2
View File
@@ -2489,8 +2489,10 @@ _asn1_print_open_type(const struct asn1_template *t, /* object set template */
}
if (!(t->tt & A1_OS_OT_IS_ARRAY)) {
unsigned align = 8 - ((t->offset + sizeof(*elementp)) & 0x7);
dp = DPOC(data, t->offset + sizeof(*elementp) + align);
size_t offset = t->offset + sizeof(*elementp);
offset += (sizeof(void *) - offset % sizeof(void *)) % sizeof(void *);
dp = DPOC(data, offset);
if (*dp) {
struct rk_strpool *r2 = NULL;
char *s = NULL;