79 lines
2.3 KiB
Diff
79 lines
2.3 KiB
Diff
From 0d468aacfc2c14b904896d9d7ee2cd07bf7c6004 Mon Sep 17 00:00:00 2001
|
|
From: akallabeth <akallabeth@posteo.net>
|
|
Date: Tue, 19 May 2020 07:41:14 +0200
|
|
Subject: [PATCH] Fixed GHSL-2020-102 heap overflow
|
|
|
|
(cherry picked from commit 197b16cc15a12813c2e4fa2d6ae9cd9c4a57e581)
|
|
---
|
|
libfreerdp/crypto/crypto.c | 41 ++++++++++++++++++++++++++++----------
|
|
1 file changed, 30 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c
|
|
index 39875f74d..10d430a82 100644
|
|
--- a/libfreerdp/crypto/crypto.c
|
|
+++ b/libfreerdp/crypto/crypto.c
|
|
@@ -96,13 +96,24 @@ exit:
|
|
static int crypto_rsa_common(const BYTE* input, int length, UINT32 key_length, const BYTE* modulus,
|
|
const BYTE* exponent, int exponent_size, BYTE* output)
|
|
{
|
|
- BN_CTX* ctx;
|
|
+ BN_CTX* ctx = NULL;
|
|
int output_length = -1;
|
|
- BYTE* input_reverse;
|
|
- BYTE* modulus_reverse;
|
|
- BYTE* exponent_reverse;
|
|
- BIGNUM* mod, *exp, *x, *y;
|
|
- input_reverse = (BYTE*) malloc(2 * key_length + exponent_size);
|
|
+ BYTE* input_reverse = NULL;
|
|
+ BYTE* modulus_reverse = NULL;
|
|
+ BYTE* exponent_reverse = NULL;
|
|
+ BIGNUM* mod = NULL;
|
|
+ BIGNUM* exp = NULL;
|
|
+ BIGNUM* x = NULL;
|
|
+ BIGNUM* y = NULL;
|
|
+ size_t bufferSize = 2 * key_length + exponent_size;
|
|
+
|
|
+ if (!input || (length < 0) || (exponent_size < 0) || !modulus || !exponent || !output)
|
|
+ return -1;
|
|
+
|
|
+ if (length > bufferSize)
|
|
+ bufferSize = length;
|
|
+
|
|
+ input_reverse = (BYTE*)calloc(bufferSize, 1);
|
|
|
|
if (!input_reverse)
|
|
return -1;
|
|
@@ -131,16 +142,24 @@ static int crypto_rsa_common(const BYTE* input, int length, UINT32 key_length, c
|
|
if (!(y = BN_new()))
|
|
goto fail_bn_y;
|
|
|
|
- BN_bin2bn(modulus_reverse, key_length, mod);
|
|
- BN_bin2bn(exponent_reverse, exponent_size, exp);
|
|
- BN_bin2bn(input_reverse, length, x);
|
|
- BN_mod_exp(y, x, exp, mod, ctx);
|
|
+ if (!BN_bin2bn(modulus_reverse, key_length, mod))
|
|
+ goto fail;
|
|
+
|
|
+ if (!BN_bin2bn(exponent_reverse, exponent_size, exp))
|
|
+ goto fail;
|
|
+ if (!BN_bin2bn(input_reverse, length, x))
|
|
+ goto fail;
|
|
+ if (BN_mod_exp(y, x, exp, mod, ctx) != 1)
|
|
+ goto fail;
|
|
output_length = BN_bn2bin(y, output);
|
|
+ if (output_length < 0)
|
|
+ goto fail;
|
|
crypto_reverse(output, output_length);
|
|
|
|
- if (output_length < (int) key_length)
|
|
+ if (output_length < key_length)
|
|
memset(output + output_length, 0, key_length - output_length);
|
|
|
|
+fail:
|
|
BN_free(y);
|
|
fail_bn_y:
|
|
BN_clear_free(x);
|
|
--
|
|
2.26.2
|
|
|