summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch')
-rw-r--r--meta/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch63
1 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch b/meta/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch
new file mode 100644
index 0000000000..be843808a2
--- /dev/null
+++ b/meta/recipes-support/gnutls/libtasn1/CVE-2017-10790.patch
@@ -0,0 +1,63 @@
1From d8d805e1f2e6799bb2dff4871a8598dc83088a39 Mon Sep 17 00:00:00 2001
2From: Nikos Mavrogiannopoulos <nmav@redhat.com>
3Date: Thu, 22 Jun 2017 16:31:37 +0200
4Subject: [PATCH] _asn1_check_identifier: safer access to values read
5
6Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
7
8http://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=commit;h=d8d805e1f2e6799bb2dff4871a8598dc83088a39
9Upstream-Status: Backport
10
11CVE: CVE-2017-10790
12
13Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
14Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
15---
16 lib/parser_aux.c | 17 ++++++++++++-----
17 1 file changed, 12 insertions(+), 5 deletions(-)
18
19diff --git a/lib/parser_aux.c b/lib/parser_aux.c
20index 976ab38..786ea64 100644
21--- a/lib/parser_aux.c
22+++ b/lib/parser_aux.c
23@@ -955,7 +955,7 @@ _asn1_check_identifier (asn1_node node)
24 if (p2 == NULL)
25 {
26 if (p->value)
27- _asn1_strcpy (_asn1_identifierMissing, p->value);
28+ _asn1_str_cpy (_asn1_identifierMissing, sizeof(_asn1_identifierMissing), (char*)p->value);
29 else
30 _asn1_strcpy (_asn1_identifierMissing, "(null)");
31 return ASN1_IDENTIFIER_NOT_FOUND;
32@@ -968,9 +968,15 @@ _asn1_check_identifier (asn1_node node)
33 if (p2 && (type_field (p2->type) == ASN1_ETYPE_DEFAULT))
34 {
35 _asn1_str_cpy (name2, sizeof (name2), node->name);
36- _asn1_str_cat (name2, sizeof (name2), ".");
37- _asn1_str_cat (name2, sizeof (name2), (char *) p2->value);
38- _asn1_strcpy (_asn1_identifierMissing, p2->value);
39+ if (p2->value)
40+ {
41+ _asn1_str_cat (name2, sizeof (name2), ".");
42+ _asn1_str_cat (name2, sizeof (name2), (char *) p2->value);
43+ _asn1_str_cpy (_asn1_identifierMissing, sizeof(_asn1_identifierMissing), (char*)p2->value);
44+ }
45+ else
46+ _asn1_strcpy (_asn1_identifierMissing, "(null)");
47+
48 p2 = asn1_find_node (node, name2);
49 if (!p2 || (type_field (p2->type) != ASN1_ETYPE_OBJECT_ID) ||
50 !(p2->type & CONST_ASSIGN))
51@@ -990,7 +996,8 @@ _asn1_check_identifier (asn1_node node)
52 _asn1_str_cpy (name2, sizeof (name2), node->name);
53 _asn1_str_cat (name2, sizeof (name2), ".");
54 _asn1_str_cat (name2, sizeof (name2), (char *) p2->value);
55- _asn1_strcpy (_asn1_identifierMissing, p2->value);
56+ _asn1_str_cpy (_asn1_identifierMissing, sizeof(_asn1_identifierMissing), (char*)p2->value);
57+
58 p2 = asn1_find_node (node, name2);
59 if (!p2 || (type_field (p2->type) != ASN1_ETYPE_OBJECT_ID)
60 || !(p2->type & CONST_ASSIGN))
61--
621.7.9.5
63