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

make sure that elf_mod_sizes() uses data_hole size aligned to section alignment

Browse Source 
this fixes a problem where elf_mod_sizes() would report size which would
be different (smaller) that the actual size of LKM code to be loaded in some
cases

Reviewed by: Johan Danielsson
This commit is contained in:
jdolecek 2000-12-27 20:29:36 +00:00
parent d6ced75307
commit f334b7ef55
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/modload/elf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: elf.c,v 1.3 1999/10/25 13:58:04 kleink Exp $ */ /* $NetBSD: elf.c,v 1.4 2000/12/27 20:29:36 jdolecek Exp $ */
/* /*
* Copyright (c) 1998 Johan Danielsson <joda@pdc.kth.se> * Copyright (c) 1998 Johan Danielsson <joda@pdc.kth.se>
@ -29,7 +29,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__RCSID("$NetBSD: elf.c,v 1.3 1999/10/25 13:58:04 kleink Exp $"); __RCSID("$NetBSD: elf.c,v 1.4 2000/12/27 20:29:36 jdolecek Exp $");
#include <sys/param.h> #include <sys/param.h>
@ -211,7 +211,8 @@ elf_mod_sizes(fd, modsize, strtablen, resrvp, sp)
s->addr); s->addr);
data_offset = off; data_offset = off;
/* later remove size of compressed hole from off */ /* later remove size of compressed hole from off */
data_hole = (ssize_t)s->addr - off; #define ROUND(V, S) (((V) + (S) - 1) & ~((S) - 1))
data_hole = (ssize_t)s->addr - ROUND(off, s->align);
} }
off = (ssize_t)s->addr + s->size; off = (ssize_t)s->addr + s->size;
} }
@ -222,7 +223,6 @@ elf_mod_sizes(fd, modsize, strtablen, resrvp, sp)
free(strtab); free(strtab);
/* XXX round to pagesize? */ /* XXX round to pagesize? */
#define ROUND(V, S) (((V) + (S) - 1) & ~((S) - 1))
*modsize = ROUND(off, sysconf(_SC_PAGESIZE)); *modsize = ROUND(off, sysconf(_SC_PAGESIZE));
/* /*