summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-07-08 00:23:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-09 18:00:18 +0100
commitd32b383c3a7af0212cf6bfc942f4f8d6ae08d986 (patch)
tree80c3b8f89b4c7907b7bbe5cb8a460eedc87744eb /meta
parent5de2efa167a4c9abec9c5e6c09fffc4c174a3a50 (diff)
downloadpoky-d32b383c3a7af0212cf6bfc942f4f8d6ae08d986.tar.gz
less: 471 -> 478
* Remove backport patch 0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch. * The LICENSE's checksum changed because of year changed, the contents are the same. (From OE-Core rev: 505f351ede9dd1eb0e6f01080ea24080697dadf4) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/less/less/0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch49
-rw-r--r--meta/recipes-extended/less/less_478.bb (renamed from meta/recipes-extended/less/less_471.bb)7
2 files changed, 3 insertions, 53 deletions
diff --git a/meta/recipes-extended/less/less/0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch b/meta/recipes-extended/less/less/0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch
deleted file mode 100644
index 455eafc492..0000000000
--- a/meta/recipes-extended/less/less/0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From e0a1add063a657b98611c94debb3631b8ffa36fe Mon Sep 17 00:00:00 2001
2From: Junling Zheng <zhengjunling@huawei.com>
3Date: Fri, 24 Apr 2015 11:24:04 +0800
4Subject: [PATCH] Fix possible buffer overrun with invalid UTF-8
5
6An out of bounds read access in the UTF-8 decoding can be triggered with
7a malformed file in the tool less. The access happens in the function
8is_utf8_well_formed due to a truncated multibyte character in the sample
9file.
10
11The bug does not crash less, it can only be made visible by running less
12with valgrind or compiling it with Address Sanitizer.
13
14Version 475 of less contains a fix for this issue. The file version.c
15contains some entry mentioning this issue (without any credit):
16
17 - v475 3/2/15 Fix possible buffer overrun with invalid UTF-8
18
19The fix is in the file line.c. We derive this patch from:
20
21https://blog.fuzzing-project.org/3-less-out-of-bounds-read-access-TFPA-0022014.html
22
23Thank Claire Robinson for validating it on Mageia 4 i586. Refer to:
24
25https://bugs.mageia.org/show_bug.cgi?id=15567
26
27Upstream Status: Backported
28
29Signed-off-by: Junling Zheng <zhengjunling@huawei.com>
30---
31 line.c | 2 +-
32 1 file changed, 1 insertion(+), 1 deletion(-)
33
34diff --git a/line.c b/line.c
35index 89495a3..474be2c 100644
36--- a/line.c
37+++ b/line.c
38@@ -807,7 +807,7 @@ pappend(c, pos)
39 mbc_buf[mbc_buf_index++] = c;
40 if (mbc_buf_index < mbc_buf_len)
41 return (0);
42- if (is_utf8_well_formed(mbc_buf))
43+ if (is_utf8_well_formed(mbc_buf, mbc_buf_index))
44 r = do_append(get_wchar(mbc_buf), mbc_buf, mbc_pos);
45 else
46 /* Complete, but not shortest form, sequence. */
47--
481.9.1
49
diff --git a/meta/recipes-extended/less/less_471.bb b/meta/recipes-extended/less/less_478.bb
index 72d256276b..fc63774dbc 100644
--- a/meta/recipes-extended/less/less_471.bb
+++ b/meta/recipes-extended/less/less_478.bb
@@ -21,15 +21,14 @@ SECTION = "console/utils"
21 21
22LICENSE = "GPLv3+ | BSD-2-Clause" 22LICENSE = "GPLv3+ | BSD-2-Clause"
23LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 23LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
24 file://LICENSE;md5=866cc220f330b04ae4661fc3cdfedea7" 24 file://LICENSE;md5=48c26a307f91af700e1f00585f215aaf"
25DEPENDS = "ncurses" 25DEPENDS = "ncurses"
26 26
27SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \ 27SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \
28 file://0001-Fix-possible-buffer-overrun-with-invalid-UTF-8.patch \
29 " 28 "
30 29
31SRC_URI[md5sum] = "9a40d29a2d84b41f9f36d7dd90b4f950" 30SRC_URI[md5sum] = "934fcc9f137b9ef66a943c224f413d39"
32SRC_URI[sha256sum] = "37f613fa9a526378788d790a92217d59b523574cf7159f6538da8564b3fb27f8" 31SRC_URI[sha256sum] = "495c7df52199a0c7e6bfbbe7697b2b54f4bf197c8b10b43957762d74483574ce"
33 32
34inherit autotools update-alternatives 33inherit autotools update-alternatives
35 34