From: AKASHI T. <tak...@li...> - 2014-07-23 07:38:40
|
This patch defines a architecture type for arm64/aarch64, and excludes some system call tests. For example, chown is not a native system call on arm64/aarch64 and so __NR_chown is not defined. Signed-off-by: AKASHI Takahiro <tak...@li...> --- audit-test/rules.mk | 2 ++ audit-test/utils/augrok | 2 ++ audit-test/utils/bin/Makefile | 8 ++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/audit-test/rules.mk b/audit-test/rules.mk index 509b288..1cfa098 100644 --- a/audit-test/rules.mk +++ b/audit-test/rules.mk @@ -48,6 +48,8 @@ LINK_AR = $(AR) rc $@ $^ LINK_EXE = $(CC) $(LDFLAGS) -o $@ $^ $(LOADLIBES) $(LDLIBS) LINK_SO = $(CC) $(LDFLAGS) -shared -o $@ $^ $(LOADLIBES) $(LDLIBS) +export MACHINE + # If MODE isn't set explicitly, the default for the machine is used export NATIVE = $(strip $(shell file /bin/bash | awk -F'[ -]' '{print $$3}')) export MODE ?= $(NATIVE) diff --git a/audit-test/utils/augrok b/audit-test/utils/augrok index f0542e5..a42cd21 100755 --- a/audit-test/utils/augrok +++ b/audit-test/utils/augrok @@ -585,6 +585,8 @@ our (%archtab) = ( 'c0009026' => 'alpha', '40000028' => 'arm', '28' => 'armeb', + 'c00000b7' => 'aarch64', + '800000b7' => 'aarch64eb', '4000004c' => 'cris', '2e' => 'h8300', '40000003' => 'i386', diff --git a/audit-test/utils/bin/Makefile b/audit-test/utils/bin/Makefile index 42b94ea..62c5538 100644 --- a/audit-test/utils/bin/Makefile +++ b/audit-test/utils/bin/Makefile @@ -112,7 +112,6 @@ ALL_EXE = $(CAPS_EXE) \ do_bind \ do_chdir \ do_chmod \ - do_chown \ do_clone \ do_delete_module \ do_dummy \ @@ -130,7 +129,6 @@ ALL_EXE = $(CAPS_EXE) \ do_init_module \ do_ioctl \ do_kill \ - do_lchown \ do_lgetxattr \ do_link \ do_linkat \ @@ -174,6 +172,10 @@ ALL_EXE = $(CAPS_EXE) \ do_utimensat \ do_utimes +ifneq ($(MACHINE), aarch64) +ALL_EXE += do_chown \ + do_lchown +endif ifeq ($(MODE), 32) ifeq ($(MACHINE), ppc64) ALL_EXE += $(ONLY32P_EXE) @@ -189,8 +191,10 @@ endif ifeq ($(MACHINE), ia64) ALL_EXE += $(ONLYIA64_EXE) else +ifneq ($(MACHINE), aarch64) ALL_EXE += $(ONLY86_EXE) endif +endif $(CAPS_EXE): LDLIBS += -lcap ifeq ($(LSM_SELINUX), true) -- 1.7.9.5 |