diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2019-09-24 15:34:26 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-27 13:01:17 +0100 |
commit | c8d0bf3411846bb3852bffaf59193801d9c7530a (patch) | |
tree | 3f6efceae7d788473f90a4c7752fe2ea2880fc0f /meta/recipes-devtools/expect | |
parent | ac27d12fe5480e9b8cc93de6a32bf9631c52d7f4 (diff) | |
download | openembedded-core-contrib-c8d0bf3411846bb3852bffaf59193801d9c7530a.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]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/expect')
-rw-r--r-- | meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch | 55 | ||||
-rw-r--r-- | meta/recipes-devtools/expect/expect_5.45.4.bb | 1 |
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 @@ +From 1407fcad6f1dac0a4efe8041660bf6139c1cd16a Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Tue, 24 Sep 2019 13:40:10 +0800 +Subject: [PATCH] exp_main_sub.c: Use PATH_MAX for path + +If expect was built from a long path whose length > 200, then it couldn't run: +$ expect -c 'puts yes' +*** buffer overflow detected ***: expect terminated +Aborted (core dumped) + +Use PATH_MAX to fix the problem. + +Upstream-Status: Pending [Upstream seems dead] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + exp_main_sub.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/exp_main_sub.c b/exp_main_sub.c +index fcfaa6e..bf6c4be 100644 +--- a/exp_main_sub.c ++++ b/exp_main_sub.c +@@ -48,6 +48,10 @@ char exp_version[] = PACKAGE_VERSION; + #define NEED_TCL_MAJOR 7 + #define NEED_TCL_MINOR 5 + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + char *exp_argv0 = "this program"; /* default program name */ + void (*exp_app_exit)() = 0; + void (*exp_event_exit)() = 0; +@@ -901,7 +905,7 @@ int sys_rc; + int rc; + + if (sys_rc) { +- char file[200]; ++ char file[PATH_MAX]; + int fd; + + sprintf(file,"%s/expect.rc",SCRIPTDIR); +@@ -917,7 +921,7 @@ int sys_rc; + } + } + if (my_rc) { +- char file[200]; ++ char file[PATH_MAX]; + char *home; + int fd; + char *getenv(); +-- +2.7.4 + 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 \ file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \ file://0001-Resolve-string-formatting-issues.patch \ file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \ + file://0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch \ " SRC_URI[md5sum] = "00fce8de158422f5ccd2666512329bd2" SRC_URI[sha256sum] = "49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34" |