summaryrefslogtreecommitdiffstats
path: root/fs/binfmt_elf_fdpic.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-10-08 11:05:01 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-11-09 00:16:27 -0500
commit22a8cb8248ba5d340307ba72432253b1dbdb5cf7 (patch)
treeddb88cce781598c909769c4d92f1e38d2716cd52 /fs/binfmt_elf_fdpic.c
parent7b1f4020d0d16a17b9c48570bdb7b4ad99be3553 (diff)
downloadop-kernel-dev-22a8cb8248ba5d340307ba72432253b1dbdb5cf7.zip
op-kernel-dev-22a8cb8248ba5d340307ba72432253b1dbdb5cf7.tar.gz
new helper: dump_align()
dump_skip to given alignment... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/binfmt_elf_fdpic.c')
-rw-r--r--fs/binfmt_elf_fdpic.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index a69fc4a..645f6e5 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -1267,12 +1267,6 @@ static int notesize(struct memelfnote *en)
/* #define DEBUG */
-static int alignfile(struct coredump_params *cprm)
-{
- static const char buf[4] = { 0, };
- return dump_emit(cprm, buf, roundup(cprm->written, 4) - cprm->written);
-}
-
static int writenote(struct memelfnote *men, struct coredump_params *cprm)
{
struct elf_note en;
@@ -1281,8 +1275,8 @@ static int writenote(struct memelfnote *men, struct coredump_params *cprm)
en.n_type = men->type;
return dump_emit(cprm, &en, sizeof(en)) &&
- dump_emit(cprm, men->name, en.n_namesz) && alignfile(cprm) &&
- dump_emit(cprm, men->data, men->datasz) && alignfile(cprm);
+ dump_emit(cprm, men->name, en.n_namesz) && dump_align(cprm, 4) &&
+ dump_emit(cprm, men->data, men->datasz) && dump_align(cprm, 4);
}
static inline void fill_elf_fdpic_header(struct elfhdr *elf, int segs)
OpenPOWER on IntegriCloud