Andrew Geissler | 5f35090 | 2021-07-23 13:09:54 -0400 | [diff] [blame] | 1 | From 027ac2ad0695bb506460f9dd7e57149b71055887 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 8 Jun 2021 23:21:01 -0700 |
| 4 | Subject: [PATCH] test-seccomp: Check for __NR_ppoll before use |
| 5 | |
| 6 | some newer architectures like riscv32 do not have __NR_ppoll from get go |
| 7 | |
| 8 | Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/19858] |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | --- |
| 11 | src/test/test-seccomp.c | 5 +++-- |
| 12 | 1 file changed, 3 insertions(+), 2 deletions(-) |
| 13 | |
| 14 | diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c |
| 15 | index b1f917eb54..daac0fcea8 100644 |
| 16 | --- a/src/test/test-seccomp.c |
| 17 | +++ b/src/test/test-seccomp.c |
| 18 | @@ -832,7 +832,7 @@ static void test_load_syscall_filter_set_raw(void) { |
| 19 | assert_se(s = hashmap_new(NULL)); |
| 20 | #if defined __NR_poll && __NR_poll >= 0 |
| 21 | assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(-1)) >= 0); |
| 22 | -#else |
| 23 | +#elif defined __NR_ppoll |
| 24 | assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0); |
| 25 | #endif |
| 26 | |
| 27 | @@ -849,7 +849,8 @@ static void test_load_syscall_filter_set_raw(void) { |
| 28 | assert_se(s = hashmap_new(NULL)); |
| 29 | #if defined __NR_poll && __NR_poll >= 0 |
| 30 | assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(EILSEQ)) >= 0); |
| 31 | -#else |
| 32 | +#elif defined __NR_ppoll |
| 33 | + assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0); |
| 34 | assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(EILSEQ)) >= 0); |
| 35 | #endif |
| 36 | |
| 37 | -- |
| 38 | 2.32.0 |
| 39 | |