diff options
| author | Olof Johansson <olof@lixom.net> | 2016-07-05 23:53:19 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2016-07-07 10:58:03 -0700 |
| commit | f6041c1d8a0825e41219a0443d365318d238d7b3 (patch) | |
| tree | a46722209d07b7de7111ac77c384e3738b36771a /samples | |
| parent | d011a4d861ce583466a8ae72a0c8e7f51c8cba4e (diff) | |
| download | linux-0-day-f6041c1d8a0825e41219a0443d365318d238d7b3.tar.gz linux-0-day-f6041c1d8a0825e41219a0443d365318d238d7b3.tar.xz | |
samples/seccomp: Add standalone config option
Add a separate Kconfig option for SAMPLES_SECCOMP.
Main reason for this is that, just like other samples, it's forced to
be a module.
Without this, since the sample is a target only controlled by
CONFIG_SECCOMP_FILTER, the samples will be built before include files are
put in place properly. For example, from an arm64 allmodconfig built with
"make -sk -j 32" (without specific target), the following happens:
samples/seccomp/bpf-fancy.c:13:27: fatal error: linux/seccomp.h: No such file or directory
samples/seccomp/bpf-helper.h:20:50: fatal error: linux/seccomp.h: No such file or directory
samples/seccomp/dropper.c:20:27: fatal error: linux/seccomp.h: No such file or directory
samples/seccomp/bpf-direct.c:21:27: fatal error: linux/seccomp.h: No such file or directory
So, just stick to the same format as other samples.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/Kconfig | 7 | ||||
| -rw-r--r-- | samples/seccomp/Makefile | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/samples/Kconfig b/samples/Kconfig index 559a58baff6ea..ccc50beaf17b8 100644 --- a/samples/Kconfig +++ b/samples/Kconfig @@ -85,4 +85,11 @@ config SAMPLE_CONNECTOR with it. See also Documentation/connector/connector.txt +config SAMPLE_SECCOMP + tristate "Build seccomp sample code -- loadable modules only" + depends on SECCOMP_FILTER && m + help + Build samples of seccomp filters using various methods of + BPF filter construction. + endif # SAMPLES diff --git a/samples/seccomp/Makefile b/samples/seccomp/Makefile index 1b4e4b8f5e477..ae7ff6f24f36c 100644 --- a/samples/seccomp/Makefile +++ b/samples/seccomp/Makefile @@ -1,7 +1,7 @@ # kbuild trick to avoid linker error. Can be omitted if a module is built. obj- := dummy.o -hostprogs-$(CONFIG_SECCOMP_FILTER) := bpf-fancy dropper bpf-direct +hostprogs-$(CONFIG_SAMPLE_SECCOMP) := bpf-fancy dropper bpf-direct HOSTCFLAGS_bpf-fancy.o += -I$(objtree)/usr/include HOSTCFLAGS_bpf-fancy.o += -idirafter $(objtree)/include |