diff options
author | Maxin B. John <maxin.john@intel.com> | 2016-07-04 16:02:04 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-10 14:12:06 +0100 |
commit | d43792151b7974f1d35a445943f62ed685288d12 (patch) | |
tree | b73682916749b30b177374faf0be1eb83b84023c /meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch | |
parent | 80fe4d6edd25bae7daa90ed172780b8f6152154c (diff) | |
download | openembedded-core-contrib-d43792151b7974f1d35a445943f62ed685288d12.tar.gz |
screen: upgrade to 4.4.0
Removed the following backported patch:
* 0001-fix-for-multijob-build.patch
* 0001-Fix-stack-overflow-due-to-too-deep-recursion.patch
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch')
-rw-r--r-- | meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch b/meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch deleted file mode 100644 index 4ac820fde2..0000000000 --- a/meta/recipes-extended/screen/screen/0001-Fix-stack-overflow-due-to-too-deep-recursion.patch +++ /dev/null @@ -1,58 +0,0 @@ -Bug: 45713 - -How to reproduce: -Run this command inside screen -$ printf '\x1b[10000000T' - -screen will recursively call MScrollV to depth n/256. -This is time consuming and will overflow stack if n is huge. - -Fixes CVE-2015-6806 - -Upstream-Status: Backport -CVE: CVE-2015-6806 - -Signed-off-by: Kuang-che Wu <kcwu@csie.org> -Signed-off-by: Amadeusz Sławiński <amade@asmblr.net> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- -diff -Naur screen-4.3.1-orig/ansi.c screen-4.3.1/ansi.c ---- screen-4.3.1-orig/ansi.c 2015-06-29 00:22:55.000000000 +0300 -+++ screen-4.3.1/ansi.c 2015-10-06 13:13:58.297648039 +0300 -@@ -2502,13 +2502,13 @@ - return; - if (n > 0) - { -+ if (ye - ys + 1 < n) -+ n = ye - ys + 1; - if (n > 256) - { - MScrollV(p, n - 256, ys, ye, bce); - n = 256; - } -- if (ye - ys + 1 < n) -- n = ye - ys + 1; - #ifdef COPY_PASTE - if (compacthist) - { -@@ -2562,15 +2562,15 @@ - } - else - { -- if (n < -256) -- { -- MScrollV(p, n + 256, ys, ye, bce); -- n = -256; -- } - n = -n; - if (ye - ys + 1 < n) - n = ye - ys + 1; - -+ if (n > 256) -+ { -+ MScrollV(p, - (n - 256), ys, ye, bce); -+ n = 256; -+ } - ml = p->w_mlines + ye; - /* Clear lines */ - for (i = ye; i > ye - n; i--, ml--) |