Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure that buffers allocated by lua_alloc() are aligned to 8-byte 

boundaries as done by kmem_alloc(9).

Fix alignment faults on armv5te; GCC emits ldrd/strd instructions for
memory operands that are guaranteed to be aligned properly.

Drop unnecessary __packed attribute from alloc_header_t at the same time.
This commit is contained in:
rin 2021-08-07 04:19:31 +00:00
parent 5aeec4b8b4
commit 4689515669
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/modules/lua/lua.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lua.c,v 1.25 2021/06/29 22:40:53 dholland Exp $ */
/* $NetBSD: lua.c,v 1.26 2021/08/07 04:19:31 rin Exp $ */
/*
* Copyright (c) 2011 - 2017 by Marc Balmer <mbalmer@NetBSD.org>.
@ -547,14 +547,18 @@ lua_require(lua_State *L)
typedef struct {
size_t size;
} __packed alloc_header_t;
} alloc_header_t;
static void *
lua_alloc(void *ud, void *ptr, size_t osize, size_t nsize)
{
void *nptr = NULL;
const size_t hdr_size = sizeof(alloc_header_t);
/*
* Make sure that buffers allocated by lua_alloc() are aligned to
* 8-byte boundaries as done by kmem_alloc(9).
*/
const size_t hdr_size = roundup(sizeof(alloc_header_t), 8);
alloc_header_t *hdr = (alloc_header_t *) ((char *) ptr - hdr_size);
if (nsize == 0) { /* freeing */