rpms/zsh
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: CVE-2018-7549 - avoid crash when copying empty hash table

Browse Source
This commit is contained in:
Kamil Dudka 2018-03-06 16:23:29 +01:00
parent 1ae62648a1
commit 1313177848
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
0005-zsh-5.4.2-CVE-2018-7549.patch Normal file
View File

@ -0,0 +1,38 @@
From 016b8889a6c30279f6ee362e34262c204ef834c2 Mon Sep 17 00:00:00 2001
From: Stephane Chazelas <stephane.chazelas@gmail.com>
Date: Fri, 22 Dec 2017 22:17:09 +0000
Subject: [PATCH 2/2] Avoid crash copying empty hash table.
Visible with typeset -p.
Upstream-commit: c2cc8b0fbefc9868fa83537f5b6d90fc1ec438dd
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
---
Src/params.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/Src/params.c b/Src/params.c
index 9c7833f..d9da7f6 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -549,10 +549,13 @@ scancopyparams(HashNode hn, UNUSED(int flags))
HashTable
copyparamtable(HashTable ht, char *name)
{
- HashTable nht = newparamtable(ht->hsize, name);
- outtable = nht;
- scanhashtable(ht, 0, 0, 0, scancopyparams, 0);
- outtable = NULL;
+ HashTable nht = 0;
+ if (ht) {
+ nht = newparamtable(ht->hsize, name);
+ outtable = nht;
+ scanhashtable(ht, 0, 0, 0, scancopyparams, 0);
+ outtable = NULL;
+ }
return nht;
}
--
2.14.3

4
zsh.spec
View File

@ -19,6 +19,9 @@ Patch1: 0001-zsh-5.4.2-funcnest.patch
# avoid NULL dereference when using ${(PA)...} on an empty array (CVE-2018-7548) # avoid NULL dereference when using ${(PA)...} on an empty array (CVE-2018-7548)
Patch4: 0004-zsh-5.4.2-CVE-2018-7548.patch Patch4: 0004-zsh-5.4.2-CVE-2018-7548.patch
# avoid crash when copying empty hash table (CVE-2018-7549)
Patch5: 0005-zsh-5.4.2-CVE-2018-7549.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: coreutils BuildRequires: coreutils
BuildRequires: gawk BuildRequires: gawk
@ -175,6 +178,7 @@ fi
%changelog %changelog
* Tue Mar 06 2018 Kamil Dudka <kdudka@redhat.com> - 5.4.2-7 * Tue Mar 06 2018 Kamil Dudka <kdudka@redhat.com> - 5.4.2-7
- avoid crash when copying empty hash table (CVE-2018-7549)
- avoid NULL dereference when using ${(PA)...} on an empty array (CVE-2018-7548) - avoid NULL dereference when using ${(PA)...} on an empty array (CVE-2018-7548)
* Mon Feb 19 2018 Kamil Dudka <kdudka@redhat.com> - 5.4.2-6 * Mon Feb 19 2018 Kamil Dudka <kdudka@redhat.com> - 5.4.2-6