From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] matio: CVE-2019-20020 patch
Date: Sun, 29 Dec 2019 01:36:01 +0100 [thread overview]
Message-ID: <20191229003601.Px3siIZ4ihO4DOjDIyIKw-lYqhTeMZVjeR3nukp-xUE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17851@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 364 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages matio
https://github.com/void-linux/void-packages/pull/17851
matio: CVE-2019-20020 patch
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
A patch file from https://github.com/void-linux/void-packages/pull/17851.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-matio-17851.patch --]
[-- Type: text/x-diff, Size: 2979 bytes --]
From 525330b8530cad7680008100e5a3cea6a009f675 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sat, 28 Dec 2019 18:27:42 -0600
Subject: [PATCH] matio: CVE-2019-20020 patch
Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
srcpkgs/matio/patches/CVE-2019-20020.patch | 45 ++++++++++++++++++++++
srcpkgs/matio/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/matio/patches/CVE-2019-20020.patch
diff --git a/srcpkgs/matio/patches/CVE-2019-20020.patch b/srcpkgs/matio/patches/CVE-2019-20020.patch
new file mode 100644
index 00000000000..f86cee5ec1a
--- /dev/null
+++ b/srcpkgs/matio/patches/CVE-2019-20020.patch
@@ -0,0 +1,45 @@
+From 8138e767bf6df7cccf1664f3a854e596628fdb2d Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens04@gmail.com>
+Date: Sat, 28 Dec 2019 18:25:58 -0600
+Subject: [PATCH] matio: CVE-2019-20020 patch
+
+Signed-off-by: Nathan Owens <ndowens04@gmail.com>
+---
+ src/mat5.c | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/src/mat5.c b/src/mat5.c
+index abdb351..776f233 100644
+--- src/mat5.c
++++ src/mat5.c
+@@ -980,10 +980,26 @@ ReadNextCell( mat_t *mat, matvar_t *matvar )
+ /* Rank and Dimension */
+ if ( uncomp_buf[0] == MAT_T_INT32 ) {
+ int j;
++ size_t size;
+ cells[i]->rank = uncomp_buf[1];
+ nbytes -= cells[i]->rank;
+ cells[i]->rank /= 4;
+- cells[i]->dims = (size_t*)malloc(cells[i]->rank*sizeof(*cells[i]->dims));
++ if ( 0 == do_clean && cells[i]->rank > 13 ) {
++ int rank = cells[i]->rank;
++ cells[i]->rank = 0;
++ Mat_Critical("%d is not a valid rank", rank);
++ continue;
++ }
++ err = SafeMul(&size, cells[i]->rank, sizeof(*cells[i]->dims));
++ if ( err ) {
++ if ( do_clean )
++ free(dims);
++ Mat_VarFree(cells[i]);
++ cells[i] = NULL;
++ Mat_Critical("Integer multiplication overflow");
++ continue;
++ }
++ cells[i]->dims = (size_t*)malloc(size);
+ if ( mat->byteswap ) {
+ for ( j = 0; j < cells[i]->rank; j++ )
+ cells[i]->dims[j] = Mat_uint32Swap(dims + j);
+--
+2.24.1
+
diff --git a/srcpkgs/matio/template b/srcpkgs/matio/template
index 9bd663e26b2..63d059701b6 100644
--- a/srcpkgs/matio/template
+++ b/srcpkgs/matio/template
@@ -1,7 +1,7 @@
# Template file for 'matio'
pkgname=matio
version=1.5.17
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="libtool"
next prev parent reply other threads:[~2019-12-29 0:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-29 0:35 [PR PATCH] " voidlinux-github
2019-12-29 0:36 ` voidlinux-github [this message]
2019-12-29 8:04 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191229003601.Px3siIZ4ihO4DOjDIyIKw-lYqhTeMZVjeR3nukp-xUE@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).