| Brad Bishop | c68388fc | 2019-08-26 01:33:31 -0400 | [diff] [blame^] | 1 | From df78be05daf4eb07f60f50ec1080cb979af32ec0 Mon Sep 17 00:00:00 2001 |
| 2 | From: marxin <marxin@138bc75d-0d04-0410-961f-82ee72b054a4> |
| 3 | Date: Tue, 23 Jul 2019 07:33:32 +0000 |
| 4 | Subject: [PATCH] libiberty: Check zero value shstrndx in simple-object-elf.c |
| 5 | |
| 6 | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@273718 138bc75d-0d04-0410-961f-82ee72b054a4 |
| 7 | |
| 8 | CVE: CVE-2019-14250 |
| 9 | Upstream-Status: Backport [from gcc: https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=273718] |
| 10 | [Removed Changelog entry] |
| 11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
| 12 | --- |
| 13 | diff --git a/libiberty/simple-object-elf.c b/libiberty/simple-object-elf.c |
| 14 | index 502388991a08..bdee963634d6 100644 |
| 15 | --- a/libiberty/simple-object-elf.c |
| 16 | +++ b/libiberty/simple-object-elf.c |
| 17 | @@ -548,7 +548,15 @@ simple_object_elf_match (unsigned char header[SIMPLE_OBJECT_MATCH_HEADER_LEN], |
| 18 | XDELETE (eor); |
| 19 | return NULL; |
| 20 | } |
| 21 | - |
| 22 | + |
| 23 | + if (eor->shstrndx == 0) |
| 24 | + { |
| 25 | + *errmsg = "invalid ELF shstrndx == 0"; |
| 26 | + *err = 0; |
| 27 | + XDELETE (eor); |
| 28 | + return NULL; |
| 29 | + } |
| 30 | + |
| 31 | return (void *) eor; |
| 32 | } |
| 33 | |