qa/workunits/suites/ffsb.sh: fix strncpy bug in ffsb

Signed-off-by: Yan, Zheng <zyan@redhat.com>
Fixes: http://tracker.ceph.com/issues/24579
(cherry picked from commit 843cddaaf83abdff0d900af85e8bd2382d834e0d)

diff --git a/qa/workunits/suites/ffsb.patch b/qa/workunits/suites/ffsb.patch
new file mode 100644 (file)
index 0000000..a512175
--- /dev/null
+++ b/qa/workunits/suites/ffsb.patch
@@ -0,0 +1,12 @@
+diff -urp 1/parser.c 2/parser.c
+--- 1/parser.c 2008-10-28 04:17:05.000000000 +0800
++++ 2/parser.c 2018-06-26 20:25:59.000000000 +0800
+@@ -203,7 +203,7 @@ static char *get_optstr(char *buf, char 
+       len = strnlen(string, BUFSIZE);
+       sprintf(search_str, "%s=%%%ds\\n", string, BUFSIZE - len-1);
+       if (1 == sscanf(line, search_str, &temp)) {
+-              len = strnlen(temp, 4096);
++              len = strnlen(temp, 4095) + 1;
+               ret_buf = malloc(len);
+               strncpy(ret_buf, temp, len);
+               return ret_buf;

diff --git a/qa/workunits/suites/ffsb.sh b/qa/workunits/suites/ffsb.sh
index 9ed66ab00633d8d8c068d77178a58ff295f69853..7c8736f919a586e5c331010c78b759a0095aefd5 100755 (executable)
--- a/qa/workunits/suites/ffsb.sh
+++ b/qa/workunits/suites/ffsb.sh
@@ -7,6 +7,7 @@ mydir=`dirname $0`
 wget http://download.ceph.com/qa/ffsb.tar.bz2
 tar jxvf ffsb.tar.bz2
 cd ffsb-*
+patch -p1 < $mydir/ffsb.patch
 ./configure
 make
 cd ..