Re: [Openvpn-devel] [PATCH v2] test_tls_crypt.c: fix global-buffer-overflow found by AddressSanitizer

2019-01-22 Thread Arne Schwabe
Am 22.01.19 um 14:34 schrieb Lev Stipakov:
> From: Lev Stipakov 
> 
> When writing data to buffer we incorrectly specify source length
>  - sizeof for pointer returns 8, but actual buffer length is 1.
> 
> Fix by replacing empty global string to local string literal and
> specifying the correct length.



Acked-By: Arne Schwabe

Arne




signature.asc
Description: OpenPGP digital signature
___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel


[Openvpn-devel] [PATCH v2] test_tls_crypt.c: fix global-buffer-overflow found by AddressSanitizer

2019-01-22 Thread Lev Stipakov
From: Lev Stipakov 

When writing data to buffer we incorrectly specify source length
 - sizeof for pointer returns 8, but actual buffer length is 1.

Fix by replacing empty global string to local string literal and
specifying the correct length.

Signed-off-by: Lev Stipakov 
---
 v2: use strlen(), fix misleading comments

 tests/unit_tests/openvpn/test_tls_crypt.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/unit_tests/openvpn/test_tls_crypt.c 
b/tests/unit_tests/openvpn/test_tls_crypt.c
index b793a7a..17f7d89 100644
--- a/tests/unit_tests/openvpn/test_tls_crypt.c
+++ b/tests/unit_tests/openvpn/test_tls_crypt.c
@@ -49,8 +49,6 @@
 #define PARAM1  "param1"
 #define PARAM2  "param two"
 
-static const char *plaintext_short = "";
-
 static const char *test_server_key = \
 "-BEGIN OpenVPN tls-crypt-v2 server key-\n"
 "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4v\n"
@@ -148,10 +146,12 @@ test_tls_crypt_setup(void **state) {
 ctx->unwrapped = alloc_buf(TESTBUF_SIZE);
 
 /* Write test plaintext */
-buf_write(>source, plaintext_short, sizeof(plaintext_short));
+const char *plaintext = "1234567890";
+buf_write(>source, plaintext, strlen(plaintext));
 
-/* Write dummy opcode and session id */
-buf_write(>ciphertext, "012345678", 1 + 8);
+/* Write test ciphertext */
+const char *ciphertext = "012345678";
+buf_write(>ciphertext, ciphertext, strlen(ciphertext));
 
 return 0;
 }
-- 
2.7.4



___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel