diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2020-01-13 14:59:39 +0200 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2020-01-14 09:28:05 +0000 |
| commit | 473a65ef5faf250e752d8df0759f7df75f92461a (patch) | |
| tree | 4d4f1968336c3c1542023a281aa6c6b9df9a019e | |
| parent | 57898f408482e5f9dc44f5d1aec0eff867161196 (diff) | |
| download | strace-473a65ef5faf250e752d8df0759f7df75f92461a.tar.gz | |
filter_seccomp: fix no-MMU build
Move the declaration of filter_generators out of HAVE_FORK ifdef
to fix build for no-MMU targets:
filter_seccomp.c: In function ‘check_seccomp_filter_properties’:
filter_seccomp.c:608:42: error: ‘filter_generators’ undeclared (first use in this function); did you mean ‘linear_filter_generator’?
for (unsigned int i = 0; i < ARRAY_SIZE(filter_generators); ++i) {
^~~~~~~~~~~~~~~~~
* filter_seccomp.c (linear_filter_generator,
binary_match_filter_generator): Declare unconditionally.
(filter_generator_t, filter_generators, filters, bpf_prog): Define
unconditionally.
* NEWS: Mention this fix.
Fixes: v5.4~57 "filter_seccomp: list of seccomp filter generation strategies"
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | filter_seccomp.c | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -16,6 +16,7 @@ Noteworthy changes in release ?.? (????-??-??) control messages. * Fixed decoding of NDA_LLADDR netlink neighbor table attribute. * Fixed build of mpers support when CFLAGS contains -flto. + * Fixed build on no-MMU architectures. * Fixed tests for glibc-2.31. Noteworthy changes in release 5.4 (2019-11-28) diff --git a/filter_seccomp.c b/filter_seccomp.c index 6f3a10f1e..fe28a6be7 100644 --- a/filter_seccomp.c +++ b/filter_seccomp.c @@ -68,8 +68,6 @@ static const struct audit_arch_t audit_arch_vec[SUPPORTED_PERSONALITIES] = { # endif }; -# ifdef HAVE_FORK - typedef unsigned short (*filter_generator_t)(struct sock_filter *, bool *overflow); static unsigned short linear_filter_generator(struct sock_filter *, @@ -92,6 +90,8 @@ static struct sock_fprog bpf_prog = { .filter = NULL, }; +# ifdef HAVE_FORK + static void ATTRIBUTE_NORETURN check_seccomp_order_do_child(void) { |