summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2019-09-24 15:34:26 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-27 13:02:16 +0100
commitb6e5346f46025699841f41fbe96680a1e1f01cad (patch)
tree8b716ac28871142b147365013c1cba1dca67787d
parent68092163cccb23ed943facea77600c02e95192c4 (diff)
downloadpoky-b6e5346f46025699841f41fbe96680a1e1f01cad.tar.gz
expect: Fix buffer overflow error when build in long path
Fixed when built the project in a long path (len(TMPDIR) > 200): $ bitbake dejagnu-native [snip] checking Tcl version 8.5 or greater... *** buffer overflow detected ***: TOPDIR/tmp-glibc/work/x86_64-linux/dejagnu-native/1.6.2-r0/recipe-sysroot-native/usr/bin/expect terminated [snip] (From OE-Core rev: c8d0bf3411846bb3852bffaf59193801d9c7530a) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch55
-rw-r--r--meta/recipes-devtools/expect/expect_5.45.4.bb1
2 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch b/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch
new file mode 100644
index 0000000000..37512fb9bc
--- /dev/null
+++ b/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch
@@ -0,0 +1,55 @@
1From 1407fcad6f1dac0a4efe8041660bf6139c1cd16a Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 24 Sep 2019 13:40:10 +0800
4Subject: [PATCH] exp_main_sub.c: Use PATH_MAX for path
5
6If expect was built from a long path whose length > 200, then it couldn't run:
7$ expect -c 'puts yes'
8*** buffer overflow detected ***: expect terminated
9Aborted (core dumped)
10
11Use PATH_MAX to fix the problem.
12
13Upstream-Status: Pending [Upstream seems dead]
14
15Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
16---
17 exp_main_sub.c | 8 ++++++--
18 1 file changed, 6 insertions(+), 2 deletions(-)
19
20diff --git a/exp_main_sub.c b/exp_main_sub.c
21index fcfaa6e..bf6c4be 100644
22--- a/exp_main_sub.c
23+++ b/exp_main_sub.c
24@@ -48,6 +48,10 @@ char exp_version[] = PACKAGE_VERSION;
25 #define NEED_TCL_MAJOR 7
26 #define NEED_TCL_MINOR 5
27
28+#ifndef PATH_MAX
29+#define PATH_MAX 4096
30+#endif
31+
32 char *exp_argv0 = "this program"; /* default program name */
33 void (*exp_app_exit)() = 0;
34 void (*exp_event_exit)() = 0;
35@@ -901,7 +905,7 @@ int sys_rc;
36 int rc;
37
38 if (sys_rc) {
39- char file[200];
40+ char file[PATH_MAX];
41 int fd;
42
43 sprintf(file,"%s/expect.rc",SCRIPTDIR);
44@@ -917,7 +921,7 @@ int sys_rc;
45 }
46 }
47 if (my_rc) {
48- char file[200];
49+ char file[PATH_MAX];
50 char *home;
51 int fd;
52 char *getenv();
53--
542.7.4
55
diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb
index 5f59083ad2..39ae6151f6 100644
--- a/meta/recipes-devtools/expect/expect_5.45.4.bb
+++ b/meta/recipes-devtools/expect/expect_5.45.4.bb
@@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
25 file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \ 25 file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \
26 file://0001-Resolve-string-formatting-issues.patch \ 26 file://0001-Resolve-string-formatting-issues.patch \
27 file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \ 27 file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \
28 file://0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch \
28 " 29 "
29SRC_URI[md5sum] = "00fce8de158422f5ccd2666512329bd2" 30SRC_URI[md5sum] = "00fce8de158422f5ccd2666512329bd2"
30SRC_URI[sha256sum] = "49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34" 31SRC_URI[sha256sum] = "49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34"