From 75d6bd67559152fa7aa3168af7604f98a4d5f5e9 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 15 Jan 2019 21:43:51 -0200 Subject: [PATCH] sleuthkit: update to 4.6.5. --- .../sleuthkit/patches/CVE-2018-19497.patch | 85 ------------------- srcpkgs/sleuthkit/template | 6 +- 2 files changed, 3 insertions(+), 88 deletions(-) delete mode 100644 srcpkgs/sleuthkit/patches/CVE-2018-19497.patch diff --git a/srcpkgs/sleuthkit/patches/CVE-2018-19497.patch b/srcpkgs/sleuthkit/patches/CVE-2018-19497.patch deleted file mode 100644 index c2d4c9d102a..00000000000 --- a/srcpkgs/sleuthkit/patches/CVE-2018-19497.patch +++ /dev/null @@ -1,85 +0,0 @@ -Patch source: -https://github.com/sleuthkit/sleuthkit/commit/bc04aa017c0bd297de8a3b7fc40ffc6ddddbb95d -From dd679ad1d855e7f69a887eb343bb53d49dc664e7 Mon Sep 17 00:00:00 2001 -From: Jordy Zomer -Date: Sat, 24 Nov 2018 12:19:38 +0100 -Subject: [PATCH 1/3] Fix CVE-2018-19497. - -An issue was discovered in The Sleuth Kit (TSK) through 4.6.4. -The "tsk_getu16(hfs->fs_info.endian, &rec_buf[rec_off2])" call in hfs_dir_open_meta_cb in -tsk/fs/hfs_dent.c does not properly check boundaries. This results in -a crash (SEGV on unknown address -READ memory access) -when reading too much in the destination buffer. ---- - tsk/fs/hfs.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git tsk/fs/hfs.c tsk/fs/hfs.c -index 00f1720b1b..0dec507165 100644 ---- tsk/fs/hfs.c -+++ tsk/fs/hfs.c -@@ -956,7 +956,8 @@ hfs_cat_traverse(HFS_INFO * hfs, - key = (hfs_btree_key_cat *) & node[rec_off]; - - keylen = 2 + tsk_getu16(hfs->fs_info.endian, key->key_len); -- if ((keylen) > nodesize) { -+ -+ if (keylen > nodesize - rec_off) { - tsk_error_set_errno(TSK_ERR_FS_GENFS); - tsk_error_set_errstr - ("hfs_cat_traverse: length of key %d in index node %d too large (%d vs %" - -From fb2bc0ad693db852fac1dcc77a072aeabe106ac8 Mon Sep 17 00:00:00 2001 -From: Jordy Zomer -Date: Sat, 24 Nov 2018 12:37:09 +0100 -Subject: [PATCH 2/3] fix length in printf of nodesize - -Also fix the length in printf next to comit dd679ad1d855e7f69a887eb343bb53d49dc664e7 ---- - tsk/fs/hfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git tsk/fs/hfs.c tsk/fs/hfs.c -index 0dec507165..4f7c0679a8 100644 ---- tsk/fs/hfs.c -+++ tsk/fs/hfs.c -@@ -961,7 +961,7 @@ hfs_cat_traverse(HFS_INFO * hfs, - tsk_error_set_errno(TSK_ERR_FS_GENFS); - tsk_error_set_errstr - ("hfs_cat_traverse: length of key %d in index node %d too large (%d vs %" -- PRIu16 ")", rec, cur_node, keylen, nodesize); -+ PRIu16 ")", rec, cur_node, keylen, nodesize - rec_off); - free(node); - return 1; - } - -From 8242588f4354339d9cb1ad82622e7c16c55391c9 Mon Sep 17 00:00:00 2001 -From: Jordy Zomer -Date: Sat, 24 Nov 2018 12:47:23 +0100 -Subject: [PATCH 3/3] UPDATE on CVE-2018-19497. - -make it >= because if keylen == nodesize - rec_off it's already past it's destination. -Also fix the sprintf ---- - tsk/fs/hfs.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git tsk/fs/hfs.c tsk/fs/hfs.c -index 4f7c0679a8..bb3819ada9 100644 ---- tsk/fs/hfs.c -+++ tsk/fs/hfs.c -@@ -957,11 +957,11 @@ hfs_cat_traverse(HFS_INFO * hfs, - - keylen = 2 + tsk_getu16(hfs->fs_info.endian, key->key_len); - -- if (keylen > nodesize - rec_off) { -+ if (keylen >= nodesize - rec_off) { - tsk_error_set_errno(TSK_ERR_FS_GENFS); - tsk_error_set_errstr - ("hfs_cat_traverse: length of key %d in index node %d too large (%d vs %" -- PRIu16 ")", rec, cur_node, keylen, nodesize - rec_off); -+ PRIu16 ")", rec, cur_node, keylen, (nodesize - rec_off)); - free(node); - return 1; - } diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template index 551ffacf56e..8936acef5b4 100644 --- a/srcpkgs/sleuthkit/template +++ b/srcpkgs/sleuthkit/template @@ -1,7 +1,7 @@ # Template file for 'sleuthkit' pkgname=sleuthkit -version=4.6.4 -revision=3 +version=4.6.5 +revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure hostmakedepends="automake libtool" @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only, IPL-1.0, CPL-1.0" homepage="https://www.sleuthkit.org/" distfiles="https://github.com/sleuthkit/${pkgname}/archive/${pkgname}-${version}.tar.gz" -checksum=9329322b738a5b721cb95c78f71efc1faaef39db3b9b2a5c1fbbbb9de7d657c2 +checksum=1c2a1d35321b346a055ceb4c38da401cf815673bf43eb0ffdc3c3020e894f237 post_extract() { sed -i 's/daddr_t/uint32_t/g' tools/srchtools/sigfind.cpp