summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorPhilip Guenthe <guenther@cvs.openbsd.org>2010-07-24 09:50:46 +0000
committerPhilip Guenthe <guenther@cvs.openbsd.org>2010-07-24 09:50:46 +0000
commit49fe345b5fafb4c54a80fb6420765929e52d74de (patch)
tree9e54248e975cc0562f90bd8be4114ea0de795ad9 /sys
parent8d3d911020951f8f75c3f759afb4b0456573388b (diff)
struct emul's e_arglen member is expected to count in units of
sizeof(char *), not in bytes, so we've been allocating and copying around four or eight times as many bytes as we needed to ok kettenis@ deraadt@
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/exec_elf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c
index 7c827e07d60..e962f9fb0f0 100644
--- a/sys/kern/exec_elf.c
+++ b/sys/kern/exec_elf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_elf.c,v 1.74 2010/06/29 00:28:14 tedu Exp $ */
+/* $OpenBSD: exec_elf.c,v 1.75 2010/07/24 09:50:45 guenther Exp $ */
/*
* Copyright (c) 1996 Per Fogelstrom
@@ -159,7 +159,7 @@ struct emul ELFNAMEEND(emul) = {
#else
NULL,
#endif
- sizeof (AuxInfo) * ELF_AUX_ENTRIES,
+ (sizeof(AuxInfo) * ELF_AUX_ENTRIES / sizeof(char *)),
ELFNAME(copyargs),
setregs,
ELFNAME2(exec,fixup),