47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
Backport patch to fix CVE-2016-6323 for glibc. And remove the section of
|
|
ChangeLog which can't be applied.
|
|
|
|
Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9e2ff6c]
|
|
CVE: CVE-2016-6323
|
|
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
|
---
|
|
From 9e2ff6c9cc54c0b4402b8d49e4abe7000fde7617 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schwab <schwab@suse.de>
|
|
Date: Mon, 8 Aug 2016 09:29:18 +0200
|
|
Subject: [PATCH] arm: mark __startcontext as .cantunwind (bug 20435)
|
|
|
|
__startcontext marks the bottom of the call stack of the contexts created
|
|
by makecontext.
|
|
---
|
|
ChangeLog | 6 ++++++
|
|
sysdeps/unix/sysv/linux/arm/setcontext.S | 7 +++++++
|
|
2 files changed, 13 insertions(+)
|
|
|
|
diff --git a/sysdeps/unix/sysv/linux/arm/setcontext.S b/sysdeps/unix/sysv/linux/arm/setcontext.S
|
|
index 603e508..d1f168f 100644
|
|
--- a/sysdeps/unix/sysv/linux/arm/setcontext.S
|
|
+++ b/sysdeps/unix/sysv/linux/arm/setcontext.S
|
|
@@ -86,12 +86,19 @@ weak_alias(__setcontext, setcontext)
|
|
|
|
/* Called when a makecontext() context returns. Start the
|
|
context in R4 or fall through to exit(). */
|
|
+ /* Unwind descriptors are looked up based on PC - 2, so we have to
|
|
+ make sure to mark the instruction preceding the __startcontext
|
|
+ label as .cantunwind. */
|
|
+ .fnstart
|
|
+ .cantunwind
|
|
+ nop
|
|
ENTRY(__startcontext)
|
|
movs r0, r4
|
|
bne PLTJMP(__setcontext)
|
|
|
|
@ New context was 0 - exit
|
|
b PLTJMP(HIDDEN_JUMPTARGET(exit))
|
|
+ .fnend
|
|
END(__startcontext)
|
|
|
|
#ifdef PIC
|
|
--
|
|
2.10.1
|
|
|