diff options
author | Ross Burton <ross.burton@arm.com> | 2023-02-20 16:28:15 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-24 11:04:27 +0000 |
commit | d4be0469a833b22e6af94a9e099e35b033151f5a (patch) | |
tree | 955875e997b43f15dbb721a0d664c3e713b68f53 | |
parent | c7b6eb9e8ec5501bf872c7d7af7da303af0f7670 (diff) | |
download | poky-d4be0469a833b22e6af94a9e099e35b033151f5a.tar.gz |
less: backport the fix for CVE-2022-46663
(From OE-Core rev: 56d31067a34bc1942c7eb4940a41ecfc81110e58)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/less/files/CVE-2022-46663.patch | 28 | ||||
-rw-r--r-- | meta/recipes-extended/less/less_608.bb | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-extended/less/files/CVE-2022-46663.patch b/meta/recipes-extended/less/files/CVE-2022-46663.patch new file mode 100644 index 0000000000..20f9d89ed8 --- /dev/null +++ b/meta/recipes-extended/less/files/CVE-2022-46663.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | CVE: CVE-2022-46663 | ||
2 | Upstream-Status: Backport | ||
3 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
4 | |||
5 | From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001 | ||
6 | From: Mark Nudelman <markn@greenwoodsoftware.com> | ||
7 | Date: Fri, 7 Oct 2022 19:25:46 -0700 | ||
8 | Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence. | ||
9 | |||
10 | --- | ||
11 | line.c | 4 ++-- | ||
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/line.c b/line.c | ||
15 | index 236c49ae..cba7bdd1 100644 | ||
16 | --- a/line.c | ||
17 | +++ b/line.c | ||
18 | @@ -633,8 +633,8 @@ ansi_step(pansi, ch) | ||
19 | /* Hyperlink ends with \7 or ESC-backslash. */ | ||
20 | if (ch == '\7') | ||
21 | return ANSI_END; | ||
22 | - if (pansi->prev_esc && ch == '\\') | ||
23 | - return ANSI_END; | ||
24 | + if (pansi->prev_esc) | ||
25 | + return (ch == '\\') ? ANSI_END : ANSI_ERR; | ||
26 | pansi->prev_esc = (ch == ESC); | ||
27 | return ANSI_MID; | ||
28 | } | ||
diff --git a/meta/recipes-extended/less/less_608.bb b/meta/recipes-extended/less/less_608.bb index f411a8fb53..f907a8159c 100644 --- a/meta/recipes-extended/less/less_608.bb +++ b/meta/recipes-extended/less/less_608.bb | |||
@@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ | |||
26 | DEPENDS = "ncurses" | 26 | DEPENDS = "ncurses" |
27 | 27 | ||
28 | SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \ | 28 | SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \ |
29 | file://CVE-2022-46663.patch \ | ||
29 | " | 30 | " |
30 | 31 | ||
31 | SRC_URI[sha256sum] = "a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209" | 32 | SRC_URI[sha256sum] = "a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209" |