From: Pauli <ppzgs1@gmail.com>
Date: Wed, 17 Mar 2021 01:40:13 +0000 (+1000)
Subject: modes: fix coverity 1449851: overlapping memory copy
X-Git-Tag: OpenSSL_1_1_1k~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81198bf323ea9deda907714170d329ca7d2ff01f;p=thirdparty%2Fopenssl.git

modes: fix coverity 1449851: overlapping memory copy

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14584)

(cherry picked from commit b875e0e820b07420429ebb90724ed28686a98853)
---

diff --git a/crypto/modes/cbc128.c b/crypto/modes/cbc128.c
index 4595b0f5022..78949c1ed7e 100644
--- a/crypto/modes/cbc128.c
+++ b/crypto/modes/cbc128.c
@@ -115,7 +115,8 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
                 out += 16;
             }
         }
-        memcpy(ivec, iv, 16);
+        if (ivec != iv)
+            memcpy(ivec, iv, 16);
     } else {
         if (STRICT_ALIGNMENT &&
             ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {