da3b34bd0a
Fixes CVE-2019-14697: musl libc 1.1.23 and earlier x87 float stack imbalance For more details, see the oss-security discussion: https://www.openwall.com/lists/oss-security/2019/08/05/6 Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
38 lines
985 B
Diff
38 lines
985 B
Diff
From 6818c31c9bc4bbad5357f1de14bedf781e5b349e Mon Sep 17 00:00:00 2001
|
|
From: Rich Felker <dalias@aerifal.cx>
|
|
Date: Mon, 5 Aug 2019 19:57:07 -0400
|
|
Subject: [PATCH] fix build regression in i386 asm for atan2, atan2f
|
|
|
|
commit f3ed8bfe8a82af1870ddc8696ed4cc1d5aa6b441 inadvertently removed
|
|
labels that were still needed.
|
|
|
|
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
|
---
|
|
src/math/i386/atan2.s | 2 +-
|
|
src/math/i386/atan2f.s | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/math/i386/atan2.s b/src/math/i386/atan2.s
|
|
index 1fa0524d..76b95f31 100644
|
|
--- a/src/math/i386/atan2.s
|
|
+++ b/src/math/i386/atan2.s
|
|
@@ -11,4 +11,4 @@ atan2:
|
|
jae 1f
|
|
# subnormal x, return x with underflow
|
|
fsts 4(%esp)
|
|
- ret
|
|
+1: ret
|
|
diff --git a/src/math/i386/atan2f.s b/src/math/i386/atan2f.s
|
|
index 0b264726..c9408a90 100644
|
|
--- a/src/math/i386/atan2f.s
|
|
+++ b/src/math/i386/atan2f.s
|
|
@@ -13,4 +13,4 @@ atan2f:
|
|
fld %st(0)
|
|
fmul %st(1)
|
|
fstps 4(%esp)
|
|
- ret
|
|
+1: ret
|
|
--
|
|
2.11.0
|
|
|