mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-15 16:07:26 +00:00
Martin Jansa
5aac941441
change_numMethods_from_bool_to_unsigned.patch added in: https://git.openembedded.org/meta-openembedded/commit/?id=3c36a8efe2a964c3aa9bfcd836cee3f80a837fcd doesn't apply cleanly: ERROR: p7zip-16.02-r0 do_patch: Fuzz detected: Applying patch change_numMethods_from_bool_to_unsigned.patch patching file CPP/7zip/Archive/Wim/WimHandler.cpp Hunk #1 succeeded at 298 with fuzz 1. The context lines in the patches can be updated with devtool: devtool modify p7zip devtool finish --force-patch-refresh p7zip <layer_path> Don't forget to review changes done by devtool! ERROR: p7zip-16.02-r0 do_patch: QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 7f2da4f810b429ddb7afa0e252e3d02ced0eba87 Mon Sep 17 00:00:00 2001
|
|
From: Radovan Scasny <radovan.scasny@siemens.com>
|
|
Date: Tue, 20 Feb 2018 12:08:13 +0100
|
|
Subject: [PATCH] p7zip: Fix CVE-2017-17969
|
|
|
|
[No upstream tracking] -- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888297
|
|
|
|
Heap-based buffer overflow in 7zip
|
|
|
|
Compress/ShrinkDecoder.cpp: Heap-based buffer overflow
|
|
in the NCompress::NShrink::CDecoder::CodeReal method
|
|
in 7-Zip before 18.00 and p7zip allows remote attackers
|
|
to cause a denial of service (out-of-bounds write)
|
|
or potentially execute arbitrary code via a crafted ZIP archive.
|
|
|
|
Upstream-Status: Backport [https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/8316/attachment/CVE-2017-17969.patch]
|
|
CVE: CVE-2017-17969
|
|
Signed-off-by: Radovan Scasny <radovan.scasny@siemens.com>
|
|
|
|
---
|
|
CPP/7zip/Compress/ShrinkDecoder.cpp | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp
|
|
index 80b7e67..5bb0559 100644
|
|
--- a/CPP/7zip/Compress/ShrinkDecoder.cpp
|
|
+++ b/CPP/7zip/Compress/ShrinkDecoder.cpp
|
|
@@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
|
|
{
|
|
_stack[i++] = _suffixes[cur];
|
|
cur = _parents[cur];
|
|
+ if (cur >= kNumItems || i >= kNumItems)
|
|
+ break;
|
|
}
|
|
+
|
|
+ if (cur >= kNumItems || i >= kNumItems)
|
|
+ break;
|
|
|
|
_stack[i++] = (Byte)cur;
|
|
lastChar2 = (Byte)cur;
|