]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
modes: fix coverity 1449851: overlapping memory copy
authorPauli <ppzgs1@gmail.com>
Wed, 17 Mar 2021 01:40:13 +0000 (11:40 +1000)
committerPauli <ppzgs1@gmail.com>
Thu, 18 Mar 2021 11:16:55 +0000 (21:16 +1000)
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14584)

(cherry picked from commit b875e0e820b07420429ebb90724ed28686a98853)

crypto/modes/cbc128.c

index 4595b0f50226d1a7d50e18937ce633cb448b70b3..78949c1ed7ed0c534a7b79e82a6c8230f24734bb 100644 (file)
@@ -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) {