less: Fix for CVE-2022-48624

Upstream-Status: Backport [https://github.com/gwsw/less/commit/c6ac6de49698be84d264a0c4c0c40bb870b10144]

(From OE-Core rev: 8d91ab209398a8415009bc3093d407bf8871dafd)

Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>

2 files changed, 42 insertions, 0 deletions

diff --git a/meta/recipes-extended/less/less/CVE-2022-48624.patch b/meta/recipes-extended/less/less/CVE-2022-48624.patch
new file mode 100644
index 0000000000..409730bd4f
--- /dev/null
+++ b/meta/recipes-extended/less/less/CVE-2022-48624.patch
@@ -0,0 +1,41 @@
+From c6ac6de49698be84d264a0c4c0c40bb870b10144 Mon Sep 17 00:00:00 2001
+From: Mark Nudelman <markn@greenwoodsoftware.com>
+Date: Sat, 25 Jun 2022 11:54:43 -0700
+Subject: [PATCH] Shell-quote filenames when invoking LESSCLOSE.
+
+Upstream-Status: Backport [https://github.com/gwsw/less/commit/c6ac6de49698be84d264a0c4c0c40bb870b10144]
+CVE: CVE-2022-48624
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ filename.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/filename.c b/filename.c
+index 5824e385..dff20c08 100644
+--- a/filename.c
++++ b/filename.c
+@@ -972,6 +972,8 @@ close_altfile(altfilename, filename)
+ {
+ #if HAVE_POPEN
+        char *lessclose;
++       char *qfilename;
++       char *qaltfilename;
+        FILE *fd;
+        char *cmd;
+        int len;
+@@ -986,9 +988,13 @@ close_altfile(altfilename, filename)
+                error("LESSCLOSE ignored; must contain no more than 2 %%s", NULL_PARG);
+                return;
+        }
+-       len = (int) (strlen(lessclose) + strlen(filename) + strlen(altfilename) + 2);
++       qfilename = shell_quote(filename);
++       qaltfilename = shell_quote(altfilename);
++       len = (int) (strlen(lessclose) + strlen(qfilename) + strlen(qaltfilename) + 2);
+        cmd = (char *) ecalloc(len, sizeof(char));
+-       SNPRINTF2(cmd, len, lessclose, filename, altfilename);
++       SNPRINTF2(cmd, len, lessclose, qfilename, qaltfilename);
++       free(qaltfilename);
++       free(qfilename);
+        fd = shellcmd(cmd);
+        free(cmd);
+        if (fd != NULL)
diff --git a/meta/recipes-extended/less/less_600.bb b/meta/recipes-extended/less/less_600.bb
index f68281ac93..f88127a9e3 100644
--- a/meta/recipes-extended/less/less_600.bb
+++ b/meta/recipes-extended/less/less_600.bb
@@ -27,6 +27,7 @@ DEPENDS = "ncurses"
 
 SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \
            file://CVE-2022-46663.patch \
+           file://CVE-2022-48624.patch \
           "
 
 SRC_URI[sha256sum] = "6633d6aa2b3cc717afb2c205778c7c42c4620f63b1d682f3d12c98af0be74d20"