[OE-core] [PATCH] ltp: update to new upstream release 20170929
Khem Raj
raj.khem at gmail.com
Thu Oct 12 00:38:33 UTC 2017
On Wed, Oct 11, 2017 at 1:30 PM, Burton, Ross <ross.burton at intel.com> wrote:
> Sorry:
>
> | fanotify08.c:56:3: error: format not a string literal and no format
> arguments [-Werror=format-security]
> | tst_res(TPASS, msg);
> | ^~~~~~~
> | fanotify08.c:58:3: error: format not a string literal and no format
> arguments [-Werror=format-security]
> | tst_res(TFAIL, msg);
> | ^~~~~~~
>
tst_res(TFAIL, "%s", msg) might fix it.
> Ross
>
> On 5 October 2017 at 18:47, Fathi Boudra <fathi.boudra at linaro.org> wrote:
>>
>> * Update SRCREV to match 20170929 release
>> * Drop patches available in 20170929 release:
>> - 0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch
>> - 0038-commands-gdb01-replace-stdin-with-dev-null.patch
>>
>> Signed-off-by: Fathi Boudra <fathi.boudra at linaro.org>
>> ---
>> ...E_SIZE-redefinition-and-O_CREAT-undeclear.patch | 113
>> ---------------------
>> ...ommands-gdb01-replace-stdin-with-dev-null.patch | 34 -------
>> .../ltp/{ltp_20170516.bb => ltp_20170929.bb} | 4 +-
>> 3 files changed, 1 insertion(+), 150 deletions(-)
>> delete mode 100644
>> meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch
>> delete mode 100644
>> meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch
>> rename meta/recipes-extended/ltp/{ltp_20170516.bb => ltp_20170929.bb}
>> (96%)
>>
>> diff --git
>> a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch
>> b/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch
>> deleted file mode 100644
>> index c8738ae0d4..0000000000
>> ---
>> a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch
>> +++ /dev/null
>> @@ -1,113 +0,0 @@
>> -From a9d5595d2fa2ab252f1cabf63f4b65c3efbafeb9 Mon Sep 17 00:00:00 2001
>> -From: Dengke Du <dengke.du at windriver.com>
>> -Date: Thu, 10 Aug 2017 15:27:03 +0800
>> -Subject: [PATCH] ltp: fix PAGE_SIZE redefinition and O_CREAT undeclear
>> when
>> - build with musl
>> -
>> -error 1:
>> -
>> -|stack_clash.c:50:22: error: expected identifier or '(' before numeric
>> constant
>> -| static unsigned long PAGE_SIZE;
>> -
>> -This is because the musl libc already contain PAGE_SIZE definition in
>> limits.c,
>> -we can check it here:
>> -
>> - https://git.musl-libc.org/cgit/musl/tree/include/limits.h#n43
>> -
>> -error 2:
>> -
>> -|ck01.c:157:22: error: 'O_CREAT' undeclared (first use in this function);
>> did you mean 'S_IREAD'?
>> -| fd = open(filename, O_CREAT | O_TRUNC | O_RDWR, 0644);
>> -| ^~~~~~~
>> -| S_IREAD
>> -
>> -This is because the musl libc put those in fcntl.h, so we should include
>> that
>> -file.
>> -
>> -Upstream-Status: Submitted [
>> https://github.com/linux-test-project/ltp/pull/194 ]
>> -
>> -Signed-off-by: Dengke Du <dengke.du at windriver.com>
>> ----
>> - testcases/cve/stack_clash.c | 12 ++++++------
>> - testcases/kernel/syscalls/flock/flock01.c | 1 +
>> - testcases/kernel/syscalls/flock/flock02.c | 1 +
>> - 3 files changed, 8 insertions(+), 6 deletions(-)
>> -
>> -diff --git a/testcases/cve/stack_clash.c b/testcases/cve/stack_clash.c
>> -index 2ef1a82..7c45991 100644
>> ---- a/testcases/cve/stack_clash.c
>> -+++ b/testcases/cve/stack_clash.c
>> -@@ -47,7 +47,7 @@
>> - #include "tst_test.h"
>> - #include "tst_safe_stdio.h"
>> -
>> --static unsigned long PAGE_SIZE;
>> -+static unsigned long PAGE_SIZE_tst;
>> - static unsigned long PAGE_MASK;
>> - static unsigned long GAP_PAGES = 256;
>> - static unsigned long THRESHOLD;
>> -@@ -66,7 +66,7 @@ void exhaust_stack_into_sigsegv(void)
>> - exhaust_stack_into_sigsegv();
>> - }
>> -
>> --#define MAPPED_LEN PAGE_SIZE
>> -+#define MAPPED_LEN PAGE_SIZE_tst
>> - static unsigned long mapped_addr;
>> -
>> - void segv_handler(int sig, siginfo_t *info, void *data
>> LTP_ATTRIBUTE_UNUSED)
>> -@@ -150,7 +150,7 @@ void do_child(void)
>> - stack_t signal_stack;
>> - struct sigaction segv_sig = {.sa_sigaction = segv_handler,
>> .sa_flags = SA_ONSTACK|SA_SIGINFO};
>> - void *map;
>> -- unsigned long gap = GAP_PAGES * PAGE_SIZE;
>> -+ unsigned long gap = GAP_PAGES * PAGE_SIZE_tst;
>> - struct rlimit rlimit;
>> -
>> - rlimit.rlim_cur = rlimit.rlim_max = RLIM_INFINITY;
>> -@@ -200,8 +200,8 @@ void setup(void)
>> - {
>> - char buf[4096], *p;
>> -
>> -- PAGE_SIZE = sysconf(_SC_PAGESIZE);
>> -- PAGE_MASK = ~(PAGE_SIZE - 1);
>> -+ PAGE_SIZE_tst = sysconf(_SC_PAGESIZE);
>> -+ PAGE_MASK = ~(PAGE_SIZE_tst - 1);
>> -
>> - buf[4095] = '\0';
>> - SAFE_FILE_SCANF("/proc/cmdline", "%4095[^\n]", buf);
>> -@@ -214,7 +214,7 @@ void setup(void)
>> - tst_res(TINFO, "stack_guard_gap = %ld", GAP_PAGES);
>> - }
>> -
>> -- THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE;
>> -+ THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE_tst;
>> -
>> - {
>> - volatile int *a = alloca(128);
>> -diff --git a/testcases/kernel/syscalls/flock/flock01.c
>> b/testcases/kernel/syscalls/flock/flock01.c
>> -index 3e17be4..06d89e3 100644
>> ---- a/testcases/kernel/syscalls/flock/flock01.c
>> -+++ b/testcases/kernel/syscalls/flock/flock01.c
>> -@@ -69,6 +69,7 @@
>> - #include <stdio.h>
>> - #include <sys/wait.h>
>> - #include <sys/file.h>
>> -+#include <fcntl.h>
>> - #include "test.h"
>> -
>> - void setup(void);
>> -diff --git a/testcases/kernel/syscalls/flock/flock02.c
>> b/testcases/kernel/syscalls/flock/flock02.c
>> -index 414df68..9ddf729 100644
>> ---- a/testcases/kernel/syscalls/flock/flock02.c
>> -+++ b/testcases/kernel/syscalls/flock/flock02.c
>> -@@ -75,6 +75,7 @@
>> - #include <sys/types.h>
>> - #include <sys/file.h>
>> - #include <sys/wait.h>
>> -+#include <fcntl.h>
>> - #include <errno.h>
>> - #include <stdio.h>
>> - #include "test.h"
>> ---
>> -2.7.4
>> -
>> diff --git
>> a/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch
>> b/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch
>> deleted file mode 100644
>> index f7c0a4bf17..0000000000
>> ---
>> a/meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch
>> +++ /dev/null
>> @@ -1,34 +0,0 @@
>> -From 2f6ab8f694b26b7f2566624f6d1f23788d6ab8a0 Mon Sep 17 00:00:00 2001
>> -From: Jan Stancek <jstancek at redhat.com>
>> -Date: Mon, 11 Sep 2017 12:57:58 +0200
>> -Subject: [PATCH] commands/gdb01: replace stdin with /dev/null
>> -
>> -If this testcase runs as background process, gdb can receive
>> -SIGTTOU and then testcase gets stuck.
>> -
>> -Signed-off-by: Jan Stancek <jstancek at redhat.com>
>> -
>> -Upstream-Status: Backport
>>
>> -[https://github.com/linux-test-project/ltp/commit/2f6ab8f694b26b7f2566624f6d1f23788d6ab8a0]
>> -
>> -Signed-off-by: Yi Zhao <yi.zhao at windriver.com>
>> ----
>> - testcases/commands/gdb/gdb01.sh | 2 +-
>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>> -
>> -diff --git a/testcases/commands/gdb/gdb01.sh
>> b/testcases/commands/gdb/gdb01.sh
>> -index 07ae36f..e3a5b51 100755
>> ---- a/testcases/commands/gdb/gdb01.sh
>> -+++ b/testcases/commands/gdb/gdb01.sh
>> -@@ -29,7 +29,7 @@ TST_NEEDS_CMDS="gdb /bin/cat"
>> -
>> - simple_test()
>> - {
>> -- gdb /bin/cat -ex "run /etc/passwd" -ex quit
>> -+ gdb /bin/cat -ex "run /etc/passwd" -ex quit < /dev/null
>> - RC=$?
>> - if [ $RC -eq 0 ] ; then
>> - tst_res TPASS "gdb attached to process and completed run"
>> ---
>> -2.7.4
>> -
>> diff --git a/meta/recipes-extended/ltp/ltp_20170516.bb
>> b/meta/recipes-extended/ltp/ltp_20170929.bb
>> similarity index 96%
>> rename from meta/recipes-extended/ltp/ltp_20170516.bb
>> rename to meta/recipes-extended/ltp/ltp_20170929.bb
>> index 653cbfd4ed..925dd91256 100644
>> --- a/meta/recipes-extended/ltp/ltp_20170516.bb
>> +++ b/meta/recipes-extended/ltp/ltp_20170929.bb
>> @@ -21,7 +21,7 @@ DEPENDS_append_libc-musl = " fts "
>> EXTRA_OEMAKE_append_libc-musl = " LIBC=musl "
>> CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
>> CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
>> -SRCREV = "18916a2e6d8c997b7b29dcfa9550d5a15b22ed22"
>> +SRCREV = "e671f2a13c695bbd87f7dfec2954ca7e3c43f377"
>>
>> SRC_URI = "git://github.com/linux-test-project/ltp.git \
>> file://0001-add-_GNU_SOURCE-to-pec_listener.c.patch \
>> @@ -48,8 +48,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
>> file://0034-periodic_output.patch \
>> file://0035-fix-test_proc_kill-hang.patch \
>>
>> file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
>> -
>> file://0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch \
>> - file://0038-commands-gdb01-replace-stdin-with-dev-null.patch \
>> "
>>
>> S = "${WORKDIR}/git"
>> --
>> 2.14.2
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
More information about the Openembedded-core
mailing list