Blame SOURCES/openssl-1.0.2k-cve-2017-3736.patch
|
 |
aa8173 |
From 38d600147331d36e74174ebbd4008b63188b321b Mon Sep 17 00:00:00 2001
|
|
|
aa8173 |
From: Andy Polyakov <appro@openssl.org>
|
|
|
aa8173 |
Date: Thu, 17 Aug 2017 21:08:57 +0200
|
|
|
aa8173 |
Subject: [PATCH] bn/asm/x86_64-mont5.pl: fix carry bug in bn_sqrx8x_internal.
|
|
|
aa8173 |
|
|
|
aa8173 |
Credit to OSS-Fuzz for finding this.
|
|
|
aa8173 |
|
|
|
aa8173 |
CVE-2017-3736
|
|
|
aa8173 |
|
|
|
aa8173 |
Reviewed-by: Rich Salz <rsalz@openssl.org>
|
|
|
aa8173 |
---
|
|
|
aa8173 |
crypto/bn/asm/x86_64-mont5.pl | 12 ++++++++++--
|
|
|
aa8173 |
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
aa8173 |
|
|
|
aa8173 |
diff --git a/crypto/bn/asm/x86_64-mont5.pl b/crypto/bn/asm/x86_64-mont5.pl
|
|
|
aa8173 |
index 3bb0cdf..42178e4 100755
|
|
|
aa8173 |
--- a/crypto/bn/asm/x86_64-mont5.pl
|
|
|
aa8173 |
+++ b/crypto/bn/asm/x86_64-mont5.pl
|
|
|
aa8173 |
@@ -3090,11 +3090,19 @@ $code.=<<___;
|
|
|
aa8173 |
|
|
|
aa8173 |
.align 32
|
|
|
aa8173 |
.Lsqrx8x_break:
|
|
|
aa8173 |
- sub 16+8(%rsp),%r8 # consume last carry
|
|
|
aa8173 |
+ xor $zero,$zero
|
|
|
aa8173 |
+ sub 16+8(%rsp),%rbx # mov 16(%rsp),%cf
|
|
|
aa8173 |
+ adcx $zero,%r8
|
|
|
aa8173 |
mov 24+8(%rsp),$carry # initial $tptr, borrow $carry
|
|
|
aa8173 |
+ adcx $zero,%r9
|
|
|
aa8173 |
mov 0*8($aptr),%rdx # a[8], modulo-scheduled
|
|
|
aa8173 |
- xor %ebp,%ebp # xor $zero,$zero
|
|
|
aa8173 |
+ adc \$0,%r10
|
|
|
aa8173 |
mov %r8,0*8($tptr)
|
|
|
aa8173 |
+ adc \$0,%r11
|
|
|
aa8173 |
+ adc \$0,%r12
|
|
|
aa8173 |
+ adc \$0,%r13
|
|
|
aa8173 |
+ adc \$0,%r14
|
|
|
aa8173 |
+ adc \$0,%r15
|
|
|
aa8173 |
cmp $carry,$tptr # cf=0, of=0
|
|
|
aa8173 |
je .Lsqrx8x_outer_loop
|
|
|
aa8173 |
|
|
|
aa8173 |
--
|
|
|
aa8173 |
2.9.5
|
|
|
aa8173 |
|