mirror of
https://git.yoctoproject.org/poky
synced 2026-02-25 10:59:41 +01:00
cd7f7bf385
Source: http://sourceware.org/git/elfutils.git MR: 97563, 97568, 97558 Type: Security Fix Disposition: Backport from http://sourceware.org/git/elfutils.git ChangeID: 6183c2a25d5e32eec1846a428dd165e1de659f24 Description: Affects <= 0.175 Fixes: CVE-2019-7146 CVE-2019-7149 CVE-2019-7150 (From OE-Core rev: ac5dca7dc68519b36aa976dfd25d8efa76af74ec) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
66 lines
1.9 KiB
Diff
66 lines
1.9 KiB
Diff
From cd7ded3df43f655af945c869976401a602e46fcd Mon Sep 17 00:00:00 2001
|
|
From: Mark Wielaard <mark@klomp.org>
|
|
Date: Wed, 30 Jan 2019 00:04:11 +0100
|
|
Subject: [PATCH] libebl: Check GNU property note data padding fits inside
|
|
note.
|
|
|
|
The GNU property note data is padded. Make sure the extra padding
|
|
still fits in the note description.
|
|
|
|
https://sourceware.org/bugzilla/show_bug.cgi?id=24075
|
|
|
|
Signed-off-by: Mark Wielaard <mark@klomp.org>
|
|
|
|
Upstream-Status: Backport
|
|
CVE: CVE-2019-7146 patch #2
|
|
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
|
|
|
---
|
|
libebl/ChangeLog | 5 +++++
|
|
libebl/eblobjnote.c | 17 +++++++++--------
|
|
2 files changed, 14 insertions(+), 8 deletions(-)
|
|
|
|
Index: elfutils-0.175/libebl/ChangeLog
|
|
===================================================================
|
|
--- elfutils-0.175.orig/libebl/ChangeLog
|
|
+++ elfutils-0.175/libebl/ChangeLog
|
|
@@ -1,3 +1,8 @@
|
|
+2019-01-29 Mark Wielaard <mark@klomp.org>
|
|
+
|
|
+ * eblobjnote.c (ebl_object_note): Check pr_datasz padding doesn't
|
|
+ overflow descsz.
|
|
+
|
|
2019-01-16 Mark Wielaard <mark@klomp.org>
|
|
|
|
* eblobjnte.c (ebl_object_note): Check pr_datasz isn't too large.
|
|
Index: elfutils-0.175/libebl/eblobjnote.c
|
|
===================================================================
|
|
--- elfutils-0.175.orig/libebl/eblobjnote.c
|
|
+++ elfutils-0.175/libebl/eblobjnote.c
|
|
@@ -486,16 +486,17 @@ ebl_object_note (Ebl *ebl, uint32_t name
|
|
printf ("%02" PRIx8 "\n", (uint8_t) desc[i]);
|
|
}
|
|
}
|
|
+
|
|
if (elfclass == ELFCLASS32)
|
|
- {
|
|
- desc += NOTE_ALIGN4 (prop.pr_datasz);
|
|
- descsz -= NOTE_ALIGN4 (prop.pr_datasz);
|
|
- }
|
|
+ prop.pr_datasz = NOTE_ALIGN4 (prop.pr_datasz);
|
|
else
|
|
- {
|
|
- desc += NOTE_ALIGN8 (prop.pr_datasz);
|
|
- descsz -= NOTE_ALIGN8 (prop.pr_datasz);
|
|
- }
|
|
+ prop.pr_datasz = NOTE_ALIGN8 (prop.pr_datasz);
|
|
+
|
|
+ desc += prop.pr_datasz;
|
|
+ if (descsz > prop.pr_datasz)
|
|
+ descsz -= prop.pr_datasz;
|
|
+ else
|
|
+ descsz = 0;
|
|
}
|
|
}
|
|
break;
|