mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
766c5ced75
affects openssl < 1.0.1i (From OE-Core rev: ed8bed3bf2d2460ff93bdaa255091e0d388a8209) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
45 lines
1.2 KiB
Diff
45 lines
1.2 KiB
Diff
From b746aa3fe05b5b5f7126df247ac3eceeb995e2a0 Mon Sep 17 00:00:00 2001
|
|
From: "Dr. Stephen Henson" <steve@openssl.org>
|
|
Date: Thu, 21 Jul 2016 15:24:16 +0100
|
|
Subject: [PATCH] Fix OOB read in TS_OBJ_print_bio().
|
|
|
|
TS_OBJ_print_bio() misuses OBJ_txt2obj: it should print the result
|
|
as a null terminated buffer. The length value returned is the total
|
|
length the complete text reprsentation would need not the amount of
|
|
data written.
|
|
|
|
CVE-2016-2180
|
|
|
|
Thanks to Shi Lei for reporting this bug.
|
|
|
|
Reviewed-by: Matt Caswell <matt@openssl.org>
|
|
(cherry picked from commit 0ed26acce328ec16a3aa635f1ca37365e8c7403a)
|
|
|
|
Upstream-Status: Backport
|
|
CVE: CVE-2016-2180
|
|
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
|
|
|
---
|
|
crypto/ts/ts_lib.c | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/crypto/ts/ts_lib.c b/crypto/ts/ts_lib.c
|
|
index c51538a..e0f1063 100644
|
|
--- a/crypto/ts/ts_lib.c
|
|
+++ b/crypto/ts/ts_lib.c
|
|
@@ -90,9 +90,8 @@ int TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj)
|
|
{
|
|
char obj_txt[128];
|
|
|
|
- int len = OBJ_obj2txt(obj_txt, sizeof(obj_txt), obj, 0);
|
|
- BIO_write(bio, obj_txt, len);
|
|
- BIO_write(bio, "\n", 1);
|
|
+ OBJ_obj2txt(obj_txt, sizeof(obj_txt), obj, 0);
|
|
+ BIO_printf(bio, "%s\n", obj_txt);
|
|
|
|
return 1;
|
|
}
|
|
--
|
|
2.7.4
|
|
|