diff options
| author | Conrad Meyer <cem@FreeBSD.org> | 2020-03-08 19:44:41 +0000 |
|---|---|---|
| committer | Conrad Meyer <cem@FreeBSD.org> | 2020-03-08 19:44:41 +0000 |
| commit | 01b2b9b6d686bc18bef1de49a5bf1bc05ebdb09d (patch) | |
| tree | fddb8430ac8db17b2895d797431b5dd7b48af59b /www/chromium/files/patch-base_debug_elf__reader.cc | |
| parent | graphics/mesa-libs: Change default to use DRI3 (diff) | |
www/chromium: update to 80.0.3987.132
This addresses some security issues, including at least one Google admits was
being exploited in the wild. For more, see:
https://chromereleases.googleblog.com/2020/02/stable-channel-update-for-desktop_24.html
PR: 244625
Approved by: jrm, rene
Security: CVE-2020-6407, CVE-2020-6418 (in the wild), CVE-2020-6420
Differential Revision: https://reviews.freebsd.org/D23984
Diffstat (limited to 'www/chromium/files/patch-base_debug_elf__reader.cc')
| -rw-r--r-- | www/chromium/files/patch-base_debug_elf__reader.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/www/chromium/files/patch-base_debug_elf__reader.cc b/www/chromium/files/patch-base_debug_elf__reader.cc index a39739736202..2cf3eb22fc0e 100644 --- a/www/chromium/files/patch-base_debug_elf__reader.cc +++ b/www/chromium/files/patch-base_debug_elf__reader.cc @@ -1,18 +1,18 @@ ---- base/debug/elf_reader.cc.orig 2019-06-04 18:55:15 UTC +--- base/debug/elf_reader.cc.orig 2020-03-03 18:52:59 UTC +++ base/debug/elf_reader.cc -@@ -83,6 +83,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, - reinterpret_cast<const Nhdr*>(elf_base + header.p_vaddr); +@@ -98,6 +98,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, bool found = false; - while (current_note < section_end) { + while (current_section < section_end) { + current_note = reinterpret_cast<const Nhdr*>(current_section); +#if !defined(OS_BSD) if (current_note->n_type == NT_GNU_BUILD_ID) { - const char* note_name = - reinterpret_cast<const char*>(current_note) + sizeof(Nhdr); -@@ -92,6 +93,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, + StringPiece note_name(current_section + sizeof(Nhdr), + current_note->n_namesz); +@@ -107,6 +108,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, break; } } +#endif - current_note = reinterpret_cast<const Nhdr*>( - reinterpret_cast<const char*>(current_note) + sizeof(Nhdr) + + size_t section_size = bits::Align(current_note->n_namesz, 4) + + bits::Align(current_note->n_descsz, 4) + |