summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-09-11 10:37:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-11 10:46:17 +0100
commita75936df894f92f225f9545d0b5f2d65f5020184 (patch)
tree10ee15f10363141a2401840d89e3f44cd8d04931
parenta22a2cca9b1f3f7e84ebb0ca3cf4c9b8a791d09b (diff)
downloadpoky-a75936df894f92f225f9545d0b5f2d65f5020184.tar.gz
lrzsz: fix CVE-2018-10195
"Integer overflow in src/zm.c:zsdata() causes crash in sz and can leak information to receiver." Take a patch from Fedora to resolve CVE-2018-10195. (From OE-Core rev: a7b50fcee9a295de57f743fa3637905992da722e) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz-0.12.20/cve-2018-10195.patch28
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb1
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/cve-2018-10195.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/cve-2018-10195.patch
new file mode 100644
index 0000000000..dea298634f
--- /dev/null
+++ b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/cve-2018-10195.patch
@@ -0,0 +1,28 @@
1Integer overflow in src/zm.c:zsdata() causes crash in sz and can leak information to receiver.
2
3Patch taken from Fedora.
4
5CVE: CVE-2018-10195
6Upstream-Status: Inappropriate (dead upstream)
7Signed-off-by: Ross Burton <ross.burton@intel.com>
8
9diff -urN lrzsz-0.12.20/src/zm.c lrzsz-0.12.20.new/src/zm.c
10--- lrzsz-0.12.20/src/zm.c Tue Dec 29 09:48:38 1998
11+++ lrzsz-0.12.20.new/src/zm.c Tue Oct 8 12:46:58 2002
12@@ -431,10 +431,12 @@
13 VPRINTF(3,("zsdata: %lu %s", (unsigned long) length,
14 Zendnames[(frameend-ZCRCE)&3]));
15 crc = 0;
16- do {
17- zsendline(*buf); crc = updcrc((0377 & *buf), crc);
18- buf++;
19- } while (--length>0);
20+
21+ for( ; length; length--) {
22+ zsendline(*buf); crc = updcrc((0377 & *buf), crc);
23+ buf++;
24+ }
25+
26 xsendline(ZDLE); xsendline(frameend);
27 crc = updcrc(frameend, crc);
28 \ No newline at end of file
diff --git a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
index 4b349be32f..002c774c6d 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
+++ b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
@@ -19,6 +19,7 @@ SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
19 file://acdefine.patch \ 19 file://acdefine.patch \
20 file://lrzsz_fix_for_automake-1.12.patch \ 20 file://lrzsz_fix_for_automake-1.12.patch \
21 file://lrzsz-check-locale.h.patch \ 21 file://lrzsz-check-locale.h.patch \
22 file://cve-2018-10195.patch \
22 " 23 "
23 24
24SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4" 25SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4"