From 3927448ce37aa352ce8c6000475d4e8aa2ab2d1d Mon Sep 17 00:00:00 2001 From: Rafal Krypa Date: Fri, 16 Jun 2017 11:15:19 +0200 Subject: [PATCH] Fix CVE-2017-6891 in minitasn1 code Based on upstream libtasn1 fix: http://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=commitdiff;h=5520704d075802df25ce4ffccc010ba1641bd484 Change-Id: I2c7742b627f9467f68643682e9287cf852a5b2a3 Signed-off-by: Rafal Krypa --- lib/minitasn1/parser_aux.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/minitasn1/parser_aux.c b/lib/minitasn1/parser_aux.c index 2285b20..3d9094c 100644 --- a/lib/minitasn1/parser_aux.c +++ b/lib/minitasn1/parser_aux.c @@ -120,6 +120,9 @@ asn1_find_node (asn1_node pointer, const char *name) if (n_end) { nsize = n_end - n_start; + if (nsize >= sizeof(n)) + return NULL; + memcpy (n, n_start, nsize); n[nsize] = 0; n_start = n_end; @@ -158,6 +161,9 @@ asn1_find_node (asn1_node pointer, const char *name) if (n_end) { nsize = n_end - n_start; + if (nsize >= sizeof(n)) + return NULL; + memcpy (n, n_start, nsize); n[nsize] = 0; n_start = n_end; -- 2.7.4