* [bug#27829] [PATCH] gnu: libtasn1: Fix CVE-2017-10790.
@ 2017-07-25 19:26 Leo Famulari
2017-07-25 19:34 ` Marius Bakke
0 siblings, 1 reply; 3+ messages in thread
From: Leo Famulari @ 2017-07-25 19:26 UTC (permalink / raw)
To: 27829
* gnu/packages/patches/libtasn1-CVE-2017-10790.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/tls.scm (libtasn1/fixed)[source]: Use it.
---
gnu/local.mk | 1 +
gnu/packages/patches/libtasn1-CVE-2017-10790.patch | 63 ++++++++++++++++++++++
gnu/packages/tls.scm | 3 +-
3 files changed, 66 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/libtasn1-CVE-2017-10790.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index f5255feff..f93929f9e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -773,6 +773,7 @@ dist_patch_DATA = \
%D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch \
%D%/packages/patches/libtar-CVE-2013-4420.patch \
%D%/packages/patches/libtasn1-CVE-2017-6891.patch \
+ %D%/packages/patches/libtasn1-CVE-2017-10790.patch \
%D%/packages/patches/libtheora-config-guess.patch \
%D%/packages/patches/libtiff-CVE-2016-10092.patch \
%D%/packages/patches/libtiff-CVE-2016-10093.patch \
diff --git a/gnu/packages/patches/libtasn1-CVE-2017-10790.patch b/gnu/packages/patches/libtasn1-CVE-2017-10790.patch
new file mode 100644
index 000000000..6cec0c803
--- /dev/null
+++ b/gnu/packages/patches/libtasn1-CVE-2017-10790.patch
@@ -0,0 +1,63 @@
+Fix CVE-2017-10790:
+
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-10790
+
+Patch copied from upstream source repository:
+
+https://git.savannah.nongnu.org/cgit/libtasn1.git/commit/?id=d8d805e1f2e6799bb2dff4871a8598dc83088a39
+
+From d8d805e1f2e6799bb2dff4871a8598dc83088a39 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@redhat.com>
+Date: Thu, 22 Jun 2017 16:31:37 +0200
+Subject: [PATCH] _asn1_check_identifier: safer access to values read
+
+Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
+---
+ lib/parser_aux.c | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/lib/parser_aux.c b/lib/parser_aux.c
+index 976ab38..786ea64 100644
+--- a/lib/parser_aux.c
++++ b/lib/parser_aux.c
+@@ -955,7 +955,7 @@ _asn1_check_identifier (asn1_node node)
+ if (p2 == NULL)
+ {
+ if (p->value)
+- _asn1_strcpy (_asn1_identifierMissing, p->value);
++ _asn1_str_cpy (_asn1_identifierMissing, sizeof(_asn1_identifierMissing), (char*)p->value);
+ else
+ _asn1_strcpy (_asn1_identifierMissing, "(null)");
+ return ASN1_IDENTIFIER_NOT_FOUND;
+@@ -968,9 +968,15 @@ _asn1_check_identifier (asn1_node node)
+ if (p2 && (type_field (p2->type) == ASN1_ETYPE_DEFAULT))
+ {
+ _asn1_str_cpy (name2, sizeof (name2), node->name);
+- _asn1_str_cat (name2, sizeof (name2), ".");
+- _asn1_str_cat (name2, sizeof (name2), (char *) p2->value);
+- _asn1_strcpy (_asn1_identifierMissing, p2->value);
++ if (p2->value)
++ {
++ _asn1_str_cat (name2, sizeof (name2), ".");
++ _asn1_str_cat (name2, sizeof (name2), (char *) p2->value);
++ _asn1_str_cpy (_asn1_identifierMissing, sizeof(_asn1_identifierMissing), (char*)p2->value);
++ }
++ else
++ _asn1_strcpy (_asn1_identifierMissing, "(null)");
++
+ p2 = asn1_find_node (node, name2);
+ if (!p2 || (type_field (p2->type) != ASN1_ETYPE_OBJECT_ID) ||
+ !(p2->type & CONST_ASSIGN))
+@@ -990,7 +996,8 @@ _asn1_check_identifier (asn1_node node)
+ _asn1_str_cpy (name2, sizeof (name2), node->name);
+ _asn1_str_cat (name2, sizeof (name2), ".");
+ _asn1_str_cat (name2, sizeof (name2), (char *) p2->value);
+- _asn1_strcpy (_asn1_identifierMissing, p2->value);
++ _asn1_str_cpy (_asn1_identifierMissing, sizeof(_asn1_identifierMissing), (char*)p2->value);
++
+ p2 = asn1_find_node (node, name2);
+ if (!p2 || (type_field (p2->type) != ASN1_ETYPE_OBJECT_ID)
+ || !(p2->type & CONST_ASSIGN))
+--
+2.13.3
+
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 0a81633aa..106cc48e7 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -81,7 +81,8 @@ specifications.")
(origin
(inherit (package-source libtasn1))
(patches
- (search-patches "libtasn1-CVE-2017-6891.patch"))))))
+ (search-patches "libtasn1-CVE-2017-6891.patch"
+ "libtasn1-CVE-2017-10790.patch"))))))
(define-public asn1c
(package
--
2.13.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#27829] [PATCH] gnu: libtasn1: Fix CVE-2017-10790.
2017-07-25 19:26 [bug#27829] [PATCH] gnu: libtasn1: Fix CVE-2017-10790 Leo Famulari
@ 2017-07-25 19:34 ` Marius Bakke
2017-08-06 0:18 ` bug#27829: " Leo Famulari
0 siblings, 1 reply; 3+ messages in thread
From: Marius Bakke @ 2017-07-25 19:34 UTC (permalink / raw)
To: Leo Famulari, 27829
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
Leo Famulari <leo@famulari.name> writes:
> * gnu/packages/patches/libtasn1-CVE-2017-10790.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
> * gnu/packages/tls.scm (libtasn1/fixed)[source]: Use it.
LGTM!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#27829: [PATCH] gnu: libtasn1: Fix CVE-2017-10790.
2017-07-25 19:34 ` Marius Bakke
@ 2017-08-06 0:18 ` Leo Famulari
0 siblings, 0 replies; 3+ messages in thread
From: Leo Famulari @ 2017-08-06 0:18 UTC (permalink / raw)
To: Marius Bakke; +Cc: 27829-done
[-- Attachment #1: Type: text/plain, Size: 357 bytes --]
On Tue, Jul 25, 2017 at 09:34:27PM +0200, Marius Bakke wrote:
> Leo Famulari <leo@famulari.name> writes:
>
> > * gnu/packages/patches/libtasn1-CVE-2017-10790.patch: New file.
> > * gnu/local.mk (dist_patch_DATA): Add it.
> > * gnu/packages/tls.scm (libtasn1/fixed)[source]: Use it.
>
> LGTM!
Pushed as 01a61d7040b1794f36547b107abce6e967d59f21.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-08-06 0:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-25 19:26 [bug#27829] [PATCH] gnu: libtasn1: Fix CVE-2017-10790 Leo Famulari
2017-07-25 19:34 ` Marius Bakke
2017-08-06 0:18 ` bug#27829: " Leo Famulari
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.