[apparmor] [PATCH] rename "subdomain" to "apparmor" in kernel regression tests
Kees Cook
kees at ubuntu.com
Mon Jul 26 07:31:32 BST 2010
This renames to AppArmor in the kernel regression test suite. Includes
spelling fixes, drops of old documentation, and removal of notes on
tests that no longer fail.
=== modified file '.bzrignore'
--- .bzrignore 2010-07-24 13:05:13 +0000
+++ .bzrignore 2010-07-24 15:54:38 +0000
@@ -177,63 +177,63 @@
utils/po/zh_CN.mo
utils/po/zh_TW.mo
utils/po/zu.mo
-tests/regression/subdomain/access
-tests/regression/subdomain/changehat
-tests/regression/subdomain/changehat_fail
-tests/regression/subdomain/changehat_fork
-tests/regression/subdomain/changehat_misc
-tests/regression/subdomain/changehat_misc2
-tests/regression/subdomain/changehat_pthread
-tests/regression/subdomain/changehat_twice
-tests/regression/subdomain/changehat_wrapper
-tests/regression/subdomain/changeprofile
-tests/regression/subdomain/chdir
-tests/regression/subdomain/chgrp
-tests/regression/subdomain/chmod
-tests/regression/subdomain/chown
-tests/regression/subdomain/clone
-tests/regression/subdomain/deleted
-tests/regression/subdomain/env_check
-tests/regression/subdomain/environ
-tests/regression/subdomain/exec
-tests/regression/subdomain/exec_qual
-tests/regression/subdomain/exec_qual2
-tests/regression/subdomain/fchdir
-tests/regression/subdomain/fchgrp
-tests/regression/subdomain/fchmod
-tests/regression/subdomain/fchown
-tests/regression/subdomain/fork
-tests/regression/subdomain/link
-tests/regression/subdomain/link_subset
-tests/regression/subdomain/mkdir
-tests/regression/subdomain/mmap
-tests/regression/subdomain/mount
-tests/regression/subdomain/named_pipe
-tests/regression/subdomain/net_raw
-tests/regression/subdomain/open
-tests/regression/subdomain/openat
-tests/regression/subdomain/pipe
-tests/regression/subdomain/ptrace
-tests/regression/subdomain/ptrace_helper
-tests/regression/subdomain/pwrite
-tests/regression/subdomain/readdir
-tests/regression/subdomain/rename
-tests/regression/subdomain/rw
-tests/regression/subdomain/swap
-tests/regression/subdomain/symlink
-tests/regression/subdomain/syscall_chroot
-tests/regression/subdomain/syscall_mknod
-tests/regression/subdomain/syscall_mlockall
-tests/regression/subdomain/syscall_ptrace
-tests/regression/subdomain/syscall_reboot
-tests/regression/subdomain/syscall_setdomainname
-tests/regression/subdomain/syscall_sethostname
-tests/regression/subdomain/syscall_setpriority
-tests/regression/subdomain/syscall_setscheduler
-tests/regression/subdomain/syscall_sysctl
-tests/regression/subdomain/sysctl_proc
-tests/regression/subdomain/tcp
-tests/regression/subdomain/unix_fd_client
-tests/regression/subdomain/unix_fd_server
-tests/regression/subdomain/unlink
-tests/regression/subdomain/xattrs
+tests/regression/apparmor/access
+tests/regression/apparmor/changehat
+tests/regression/apparmor/changehat_fail
+tests/regression/apparmor/changehat_fork
+tests/regression/apparmor/changehat_misc
+tests/regression/apparmor/changehat_misc2
+tests/regression/apparmor/changehat_pthread
+tests/regression/apparmor/changehat_twice
+tests/regression/apparmor/changehat_wrapper
+tests/regression/apparmor/changeprofile
+tests/regression/apparmor/chdir
+tests/regression/apparmor/chgrp
+tests/regression/apparmor/chmod
+tests/regression/apparmor/chown
+tests/regression/apparmor/clone
+tests/regression/apparmor/deleted
+tests/regression/apparmor/env_check
+tests/regression/apparmor/environ
+tests/regression/apparmor/exec
+tests/regression/apparmor/exec_qual
+tests/regression/apparmor/exec_qual2
+tests/regression/apparmor/fchdir
+tests/regression/apparmor/fchgrp
+tests/regression/apparmor/fchmod
+tests/regression/apparmor/fchown
+tests/regression/apparmor/fork
+tests/regression/apparmor/link
+tests/regression/apparmor/link_subset
+tests/regression/apparmor/mkdir
+tests/regression/apparmor/mmap
+tests/regression/apparmor/mount
+tests/regression/apparmor/named_pipe
+tests/regression/apparmor/net_raw
+tests/regression/apparmor/open
+tests/regression/apparmor/openat
+tests/regression/apparmor/pipe
+tests/regression/apparmor/ptrace
+tests/regression/apparmor/ptrace_helper
+tests/regression/apparmor/pwrite
+tests/regression/apparmor/readdir
+tests/regression/apparmor/rename
+tests/regression/apparmor/rw
+tests/regression/apparmor/swap
+tests/regression/apparmor/symlink
+tests/regression/apparmor/syscall_chroot
+tests/regression/apparmor/syscall_mknod
+tests/regression/apparmor/syscall_mlockall
+tests/regression/apparmor/syscall_ptrace
+tests/regression/apparmor/syscall_reboot
+tests/regression/apparmor/syscall_setdomainname
+tests/regression/apparmor/syscall_sethostname
+tests/regression/apparmor/syscall_setpriority
+tests/regression/apparmor/syscall_setscheduler
+tests/regression/apparmor/syscall_sysctl
+tests/regression/apparmor/sysctl_proc
+tests/regression/apparmor/tcp
+tests/regression/apparmor/unix_fd_client
+tests/regression/apparmor/unix_fd_server
+tests/regression/apparmor/unlink
+tests/regression/apparmor/xattrs
=== modified file 'README'
--- README 2010-07-22 15:07:10 +0000
+++ README 2010-07-24 15:54:38 +0000
@@ -98,10 +98,10 @@
Regression tests
----------------
For details on structure and adding tests, see
-tests/regression/subdomain/README.
+tests/regression/apparmor/README.
To run:
-$ cd tests/regression/subdomain (requires root)
+$ cd tests/regression/apparmor (requires root)
$ make
$ sudo make tests
$ sudo bash open.sh -r # runs and saves the last testcase from open.sh
@@ -119,14 +119,14 @@
Libapparmor
-----------
-For detail son structure and adding tests, see libraries/libapparmor/README.
+For details on structure and adding tests, see libraries/libapparmor/README.
$ cd libraries/libapparmor
$ make check
Stress Tests
------------
-To run subdomain stress tests:
+To run AppArmor stress tests:
$ make all
Use these:
=== renamed directory 'tests/regression/subdomain' => 'tests/regression/apparmor'
=== modified file 'tests/regression/apparmor/README'
--- tests/regression/subdomain/README 2006-09-15 22:39:59 +0000
+++ tests/regression/apparmor/README 2010-07-24 15:54:38 +0000
@@ -1,10 +1,10 @@
Running tests
=============
-Type "make tests" at the shell prompt, this will make the subprograms
-and run the tests.
+Type "sudo make tests" at the shell prompt, this will make the
+subprograms and run the tests.
-You must be root to execute make tests (a requirement of subdomain).
+You must be root to execute "make tests" (a requirement of AppArmor).
(There is also a 'make alltests', which adds a test for bug that, when
triggered, would cause the kernel to crash.)
@@ -29,7 +29,7 @@
Common user changeable environment variables are stored in the file
'uservars.inc'. Currently the path to the tmp directory, the path
-to the subdomain_parser executable, and any additional arguments to give
+to the apparmor_parser executable, and any additional arguments to give
to the parser are specified in this configuration file.
(Note: the tmp directory specified in uservars.inc will have an added
@@ -66,7 +66,7 @@
directory will contain the files for the failed subtest.
It may be necessary to create certain temp files in this directory in order to
-have the test function correctly, see the subdomain profile 'profile' in the
+have the test function correctly, see the AppArmor profile 'profile' in the
directory in order to determine which files may need to be created to support
the executable.
@@ -155,7 +155,7 @@
<requirement placed on the shell script author by prologue.inc>
bin=$pwd
- <prologie.inc must be included before running any tests>
+ <prologue.inc must be included before running any tests>
. $bin/prologue.inc
<variable definitions used by this script?
@@ -174,7 +174,7 @@
# NOLINK PERMTEST
<generate a new profile allowing only r access to /bin/true>
- <subdomain_parser will automatically be invoked in -r mode>
+ <apparmor_parser will automatically be invoked in -r mode>
genprofile $file:$badperm
<run this test (exec) passing /bin/true as argv[1]>
@@ -183,16 +183,11 @@
<Thats it. Exit status $rc is automatically returned by epilogue.inc>
-Additional documentation
-========================
-
-See the file 'subdomain_test.txt'
-
Supporting files
================
strace.sh Not a test harness, used to support strace testing.
-mkprofile.sh Not a test harness, used to generate subdomain profiles.
+mkprofile.sh Not a test harness, used to generate AppArmor profiles.
prologue.inc Must be dotted (included) into the test harness. Provides
support routines.
epilogue.inc Cleanup support, automatically called upon successful or
@@ -222,17 +217,3 @@
This is not an error, rather a sign that bash noticed the kernel had killed
a process which was attempting to use a bogus MAGIC number. Alas, there is
no way to get bash to not print this diagnostic
-
-3) Ptrace
- Error: open passed. Test 'STRACE OPEN (x confinement)'
- was expected to 'fail'
-
- Regression from 2.4.18 to 2.4.20. (We aren't sure on the first
- endpoint, and the problem still happens in 2.4.20-20_imnx_10smp.)
-
-4) Open
- Error: open passed. Test 'OPEN W (create)' was expected to 'fail'
-
- LSM issue. Flags passed to inode_permission are 0 if O_CREAT is used to
- open file. Need to submit a patch to inode_create hook to receive the
- O_RDWR flags. See https://bugs.wirex.com/show_bug.cgi?id=2885
--
Kees Cook
Ubuntu Security Team
More information about the AppArmor
mailing list