From: Pauli <pauli@openssl.org>
Date: Wed, 16 Mar 2022 03:13:25 +0000 (+1100)
Subject: Fix Coverity 1498612: integer overflow
X-Git-Tag: OpenSSL_1_1_1o~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00e5603de13e4f436a0f07abed28b7ea8e3a236e;p=thirdparty%2Fopenssl.git

Fix Coverity 1498612: integer overflow

The assert added cannot ever fail because (current & 0xFFFF) != 0 from the
while loop and the trailing zero bit count therefore cannot be as large as 32.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/17892)

(cherry picked from commit 81487b65b9eb8148471e729b8c1959521d62c69e)
---

diff --git a/crypto/ec/curve448/curve448.c b/crypto/ec/curve448/curve448.c
index 12d97f06795..3aff9802092 100644
--- a/crypto/ec/curve448/curve448.c
+++ b/crypto/ec/curve448/curve448.c
@@ -577,6 +577,7 @@ static int recode_wnaf(struct smvt_control *control,
             int32_t delta = odd & mask;
 
             assert(position >= 0);
+            assert(pos < 32);       /* can't fail since current & 0xFFFF != 0 */
             if (odd & (1 << (table_bits + 1)))
                 delta -= (1 << (table_bits + 1));
             current -= delta * (1 << pos);