Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

samples/seccomp: fix dependencies on arch macros

Browse source 
This change fixes the compilation error reported for
i386 allmodconfig here:
  http://kisskb.ellerman.id.au/kisskb/buildresult/6123842/

Logic attempting to predict the host architecture has been
removed from the Makefile.  Instead, the bpf-direct sample
should now compile on any architecture, but if the architecture
is not supported, it will compile a minimal main() function.

This change also ensures the samples are not compiled when
there is no seccomp filter support.

Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Suggested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Will Drewry <wad@chromium.org>
This commit is contained in:
Will Drewry 2012-04-18 17:53:16 -05:00 committed by Iliyan Malchev
parent 4444d9b1b4
commit 05acc0b62e
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
samples/seccomp/Makefile
View file

@ -1,27 +1,21 @@
# kbuild trick to avoid linker error. Can be omitted if a module is built. # kbuild trick to avoid linker error. Can be omitted if a module is built.
obj- := dummy.o obj- := dummy.o
hostprogs-$(CONFIG_SECCOMP) := bpf-fancy dropper hostprogs-$(CONFIG_SECCOMP_FILTER) := bpf-fancy dropper bpf-direct
bpf-fancy-objs := bpf-fancy.o bpf-helper.o
HOSTCFLAGS_bpf-fancy.o += -I$(objtree)/usr/include HOSTCFLAGS_bpf-fancy.o += -I$(objtree)/usr/include
HOSTCFLAGS_bpf-fancy.o += -idirafter $(objtree)/include HOSTCFLAGS_bpf-fancy.o += -idirafter $(objtree)/include
HOSTCFLAGS_bpf-helper.o += -I$(objtree)/usr/include HOSTCFLAGS_bpf-helper.o += -I$(objtree)/usr/include
HOSTCFLAGS_bpf-helper.o += -idirafter $(objtree)/include HOSTCFLAGS_bpf-helper.o += -idirafter $(objtree)/include
bpf-fancy-objs := bpf-fancy.o bpf-helper.o
HOSTCFLAGS_dropper.o += -I$(objtree)/usr/include HOSTCFLAGS_dropper.o += -I$(objtree)/usr/include
HOSTCFLAGS_dropper.o += -idirafter $(objtree)/include HOSTCFLAGS_dropper.o += -idirafter $(objtree)/include
dropper-objs := dropper.o dropper-objs := dropper.o
# bpf-direct.c is x86-only.
ifeq ($(SRCARCH),x86)
# List of programs to build
hostprogs-$(CONFIG_SECCOMP) += bpf-direct
bpf-direct-objs := bpf-direct.o
endif
HOSTCFLAGS_bpf-direct.o += -I$(objtree)/usr/include HOSTCFLAGS_bpf-direct.o += -I$(objtree)/usr/include
HOSTCFLAGS_bpf-direct.o += -idirafter $(objtree)/include HOSTCFLAGS_bpf-direct.o += -idirafter $(objtree)/include
bpf-direct-objs := bpf-direct.o
# Try to match the kernel target. # Try to match the kernel target.
ifeq ($(CONFIG_64BIT),) ifeq ($(CONFIG_64BIT),)

18
samples/seccomp/bpf-direct.c
View file

@ -8,6 +8,11 @@
* and can serve as a starting point for developing * and can serve as a starting point for developing
* applications using prctl(PR_SET_SECCOMP, 2, ...). * applications using prctl(PR_SET_SECCOMP, 2, ...).
*/ */
#if defined(__i386__) || defined(__x86_64__)
#define SUPPORTED_ARCH 1
#endif
#if defined(SUPPORTED_ARCH)
#define __USE_GNU 1 #define __USE_GNU 1
#define _GNU_SOURCE 1 #define _GNU_SOURCE 1
@ -43,8 +48,6 @@
#define REG_ARG3 REG_R10 #define REG_ARG3 REG_R10
#define REG_ARG4 REG_R8 #define REG_ARG4 REG_R8
#define REG_ARG5 REG_R9 #define REG_ARG5 REG_R9
#else
#error Unsupported platform
#endif #endif
#ifndef PR_SET_NO_NEW_PRIVS #ifndef PR_SET_NO_NEW_PRIVS
@ -174,3 +177,14 @@ int main(int argc, char **argv)
payload("Error message going to STDERR\n")); payload("Error message going to STDERR\n"));
return 0; return 0;
} }
#else /* SUPPORTED_ARCH */
/*
* This sample is x86-only. Since kernel samples are compiled with the
* host toolchain, a non-x86 host will result in using only the main()
* below.
*/
int main(void)
{
return 1;
}
#endif /* SUPPORTED_ARCH */