- elf-include-terminating-zero-in-n_namesz.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     elf: include terminating zero in n_namesz
has been removed from the -mm tree.  Its filename was
     elf-include-terminating-zero-in-n_namesz.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: elf: include terminating zero in n_namesz
From: Magnus Damm <magnus@xxxxxxxxxxxxx>

The ELF32 spec says we should plus we include the zero on other platforms.

Signed-off-by: Magnus Damm <magnus@xxxxxxxxxxxxx>
Cc: Daniel Jacobowitz <drow@xxxxxxxxx>
Cc: Roland McGrath <roland@xxxxxxxxxx>
Cc: Jakub Jelinek <jakub@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 arch/mips/kernel/irixelf.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/mips/kernel/irixelf.c~elf-include-terminating-zero-in-n_namesz arch/mips/kernel/irixelf.c
--- a/arch/mips/kernel/irixelf.c~elf-include-terminating-zero-in-n_namesz
+++ a/arch/mips/kernel/irixelf.c
@@ -1009,7 +1009,7 @@ static int notesize(struct memelfnote *e
 	int sz;
 
 	sz = sizeof(struct elf_note);
-	sz += roundup(strlen(en->name), 4);
+	sz += roundup(strlen(en->name) + 1, 4);
 	sz += roundup(en->datasz, 4);
 
 	return sz;
@@ -1028,7 +1028,7 @@ static int writenote(struct memelfnote *
 {
 	struct elf_note en;
 
-	en.n_namesz = strlen(men->name);
+	en.n_namesz = strlen(men->name) + 1;
 	en.n_descsz = men->datasz;
 	en.n_type = men->type;
 
_

Patches currently in -mm which might be from magnus@xxxxxxxxxxxxx are

origin.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux