aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <magnus@valinux.co.jp>2006-12-06 23:37:56 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 11:39:38 -0500
commit584236ac7cdddeec0fdff25d2e475471ef91d028 (patch)
tree78ddc51de4dde2bd1569d6c6ebfe03aad5cd2b90
parent386d9a7edd9f3492c99124b0a659e9ed7abb30f9 (diff)
[PATCH] elf: include terminating zero in n_namesz
The ELF32 spec says we should plus we include the zero on other platforms. Signed-off-by: Magnus Damm <magnus@valinux.co.jp> Cc: Daniel Jacobowitz <drow@false.org> Cc: Roland McGrath <roland@redhat.com> Cc: Jakub Jelinek <jakub@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/mips/kernel/irixelf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c
index a82fae221ce4..1bbefbf43373 100644
--- a/arch/mips/kernel/irixelf.c
+++ b/arch/mips/kernel/irixelf.c
@@ -1009,7 +1009,7 @@ static int notesize(struct memelfnote *en)
1009 int sz; 1009 int sz;
1010 1010
1011 sz = sizeof(struct elf_note); 1011 sz = sizeof(struct elf_note);
1012 sz += roundup(strlen(en->name), 4); 1012 sz += roundup(strlen(en->name) + 1, 4);
1013 sz += roundup(en->datasz, 4); 1013 sz += roundup(en->datasz, 4);
1014 1014
1015 return sz; 1015 return sz;
@@ -1028,7 +1028,7 @@ static int writenote(struct memelfnote *men, struct file *file)
1028{ 1028{
1029 struct elf_note en; 1029 struct elf_note en;
1030 1030
1031 en.n_namesz = strlen(men->name); 1031 en.n_namesz = strlen(men->name) + 1;
1032 en.n_descsz = men->datasz; 1032 en.n_descsz = men->datasz;
1033 en.n_type = men->type; 1033 en.n_type = men->type;
1034 1034