8ac5aef8f3
This change takes capsicum-test from upstream and applies some local changes to make the
tests work on FreeBSD when executed via Kyua.
The local modifications are as follows:
1. Make `OpenatTest.WithFlag` pass with the new dot-dot lookup behavior in FreeBSD 12.x+.
2. capsicum-test references a set of helper binaries: `mini-me`, `mini-me.noexec`, and
`mini-me.setuid`, as part of the execve/fexecve tests, via execve, fexecve, and open.
It achieves this upstream by assuming `mini-me*` is in the current directory, however,
in order for Kyua to execute `capsicum-test`, it needs to provide a full path to
`mini-me*`. In order to achieve this, I made `capsicum-test` cache the executable's
path from argv[0] in main(..) and use the cached value to compute the path to
`mini-me*` as part of the execve/fexecve testcases.
3. The capsicum-test test suite assumes that it's always being run on CAPABILITIES enabled
kernels. However, there's a chance that the test will be run on a host without a
CAPABILITIES enabled kernel, so we must check for the support before running the tests.
The way to achieve this is to add the relevant `feature_present("security_capabilities")`
check to SetupEnvironment::SetUp() and skip the tests when the support is not available.
While here, add a check for `kern.trap_enotcap` being enabled. As noted by markj@ in
https://github.com/google/capsicum-test/issues/23, this sysctl being enabled can trigger
non-deterministic failures. Therefore, the tests should be skipped if this sysctl is
enabled.
All local changes have been submitted to the capsicum-test project
(https://github.com/google/capsicum-test) and are in various stages of review.
Please see the following pull requests for more details:
1. https://github.com/google/capsicum-test/pull/35
2. https://github.com/google/capsicum-test/pull/41
3. https://github.com/google/capsicum-test/pull/42
Reviewed by: asomers
Discussed with: emaste, markj
Approved by: emaste (mentor)
MFC after: 2 months
Differential Revision: https://reviews.freebsd.org/D19758
46 lines
1.3 KiB
C++
46 lines
1.3 KiB
C++
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
|
|
#include "capsicum.h"
|
|
#include "syscalls.h"
|
|
#include "capsicum-test.h"
|
|
|
|
#ifdef HAVE_SYSCALL
|
|
double RepeatSyscall(int count, int nr, long arg1, long arg2, long arg3) {
|
|
const clock_t t0 = clock(); // or gettimeofday or whatever
|
|
for (int ii = 0; ii < count; ii++) {
|
|
syscall(nr, arg1, arg2, arg3);
|
|
}
|
|
const clock_t t1 = clock();
|
|
return (t1 - t0) / (double)CLOCKS_PER_SEC;
|
|
}
|
|
|
|
typedef int (*EntryFn)(void);
|
|
|
|
double CompareSyscall(EntryFn entry_fn, int count, int nr,
|
|
long arg1, long arg2, long arg3) {
|
|
double bare = RepeatSyscall(count, nr, arg1, arg2, arg3);
|
|
EXPECT_OK(entry_fn());
|
|
double capmode = RepeatSyscall(count, nr, arg1, arg2, arg3);
|
|
if (verbose) fprintf(stderr, "%d iterations bare=%fs capmode=%fs ratio=%.2f%%\n",
|
|
count, bare, capmode, 100.0*capmode/bare);
|
|
if (bare==0.0) {
|
|
if (capmode==0.0) return 1.0;
|
|
return 999.0;
|
|
}
|
|
return capmode/bare;
|
|
}
|
|
|
|
FORK_TEST(Overhead, GetTid) {
|
|
EXPECT_GT(10, CompareSyscall(&cap_enter, 10000, __NR_gettid, 0, 0, 0));
|
|
}
|
|
FORK_TEST(Overhead, Seek) {
|
|
int fd = open("/etc/passwd", O_RDONLY);
|
|
EXPECT_GT(50, CompareSyscall(&cap_enter, 10000, __NR_lseek, fd, 0, SEEK_SET));
|
|
close(fd);
|
|
}
|
|
#endif
|