Author: markj
Date: Tue Feb 4 21:17:59 2020
New Revision: 357539
URL: https://svnweb.freebsd.org/changeset/base/357539
Log:
size: Avoid returning a stack pointer from xlatetom().
The callers only check whether the returned pointer is non-NULL, so this
was harmless in practice, but change the return value to guard against
the issue.
CID: 1411597
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Modified:
head/contrib/elftoolchain/size/size.c
Modified: head/contrib/elftoolchain/size/size.c
==============================================================================
--- head/contrib/elftoolchain/size/size.c Tue Feb 4 21:16:56 2020
(r357538)
+++ head/contrib/elftoolchain/size/size.c Tue Feb 4 21:17:59 2020
(r357539)
@@ -240,7 +240,7 @@ main(int argc, char **argv)
return (rc);
}
-static Elf_Data *
+static int
xlatetom(Elf *elf, GElf_Ehdr *elfhdr, void *_src, void *_dst,
Elf_Type type, size_t size)
{
@@ -253,7 +253,8 @@ xlatetom(Elf *elf, GElf_Ehdr *elfhdr, void *_src, void
dst.d_buf = _dst;
dst.d_version = elfhdr->e_version;
dst.d_size = size;
- return (gelf_xlatetom(elf, &dst, &src, elfhdr->e_ident[EI_DATA]));
+ return (gelf_xlatetom(elf, &dst, &src, elfhdr->e_ident[EI_DATA]) !=
+ NULL ? 0 : 1);
}
#define NOTE_OFFSET_32(nhdr, namesz, offset) \
@@ -314,12 +315,12 @@ handle_core_note(Elf *elf, GElf_Ehdr *elfhdr, GElf_Phd
while (data != NULL && offset + sizeof(Elf32_Nhdr) < segment_end) {
nhdr = (Elf32_Nhdr *)(uintptr_t)((char*)data + offset);
memset(&nhdr_l, 0, sizeof(Elf32_Nhdr));
- if (!xlatetom(elf, elfhdr, &nhdr->n_type, &nhdr_l.n_type,
- ELF_T_WORD, sizeof(Elf32_Word)) ||
- !xlatetom(elf, elfhdr, &nhdr->n_descsz, &nhdr_l.n_descsz,
- ELF_T_WORD, sizeof(Elf32_Word)) ||
- !xlatetom(elf, elfhdr, &nhdr->n_namesz, &nhdr_l.n_namesz,
- ELF_T_WORD, sizeof(Elf32_Word)))
+ if (xlatetom(elf, elfhdr, &nhdr->n_type, &nhdr_l.n_type,
+ ELF_T_WORD, sizeof(Elf32_Word)) != 0 ||
+ xlatetom(elf, elfhdr, &nhdr->n_descsz, &nhdr_l.n_descsz,
+ ELF_T_WORD, sizeof(Elf32_Word)) != 0 ||
+ xlatetom(elf, elfhdr, &nhdr->n_namesz, &nhdr_l.n_namesz,
+ ELF_T_WORD, sizeof(Elf32_Word)) != 0)
break;
if (offset + sizeof(Elf32_Nhdr) +
@@ -356,10 +357,10 @@ handle_core_note(Elf *elf, GElf_Ehdr *elfhdr, GElf_Phd
pid = PID64(nhdr,
nhdr_l.n_namesz, 40);
}
- xlatetom(elf, elfhdr, &raw_size, &raw_size,
- ELF_T_WORD, sizeof(uint64_t));
- xlatetom(elf, elfhdr, &pid, &pid, ELF_T_WORD,
- sizeof(pid_t));
+ (void)xlatetom(elf, elfhdr, &raw_size,
+ &raw_size, ELF_T_WORD, sizeof(uint64_t));
+ (void)xlatetom(elf, elfhdr, &pid, &pid,
+ ELF_T_WORD, sizeof(pid_t));
}
if (raw_size != 0 && style == STYLE_SYSV) {
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
