selftests: capabilities: convert error output to TAP13 ksft framework
Convert errx() and err() usage to appropriate TAP13 ksft API. Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
This commit is contained in:
parent
0e64f1d7dd
commit
3c1f619eea
|
@ -1,7 +1,6 @@
|
||||||
#define _GNU_SOURCE
|
#define _GNU_SOURCE
|
||||||
|
|
||||||
#include <cap-ng.h>
|
#include <cap-ng.h>
|
||||||
#include <err.h>
|
|
||||||
#include <linux/capability.h>
|
#include <linux/capability.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -39,29 +38,32 @@ static void vmaybe_write_file(bool enoent_ok, char *filename, char *fmt, va_list
|
||||||
int buf_len;
|
int buf_len;
|
||||||
|
|
||||||
buf_len = vsnprintf(buf, sizeof(buf), fmt, ap);
|
buf_len = vsnprintf(buf, sizeof(buf), fmt, ap);
|
||||||
if (buf_len < 0) {
|
if (buf_len < 0)
|
||||||
err(1, "vsnprintf failed");
|
ksft_exit_fail_msg("vsnprintf failed - %s\n", strerror(errno));
|
||||||
}
|
|
||||||
if (buf_len >= sizeof(buf)) {
|
if (buf_len >= sizeof(buf))
|
||||||
errx(1, "vsnprintf output truncated");
|
ksft_exit_fail_msg("vsnprintf output truncated\n");
|
||||||
}
|
|
||||||
|
|
||||||
fd = open(filename, O_WRONLY);
|
fd = open(filename, O_WRONLY);
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
if ((errno == ENOENT) && enoent_ok)
|
if ((errno == ENOENT) && enoent_ok)
|
||||||
return;
|
return;
|
||||||
err(1, "open of %s failed", filename);
|
ksft_exit_fail_msg("open of %s failed - %s\n",
|
||||||
|
filename, strerror(errno));
|
||||||
}
|
}
|
||||||
written = write(fd, buf, buf_len);
|
written = write(fd, buf, buf_len);
|
||||||
if (written != buf_len) {
|
if (written != buf_len) {
|
||||||
if (written >= 0) {
|
if (written >= 0) {
|
||||||
errx(1, "short write to %s", filename);
|
ksft_exit_fail_msg("short write to %s\n", filename);
|
||||||
} else {
|
} else {
|
||||||
err(1, "write to %s failed", filename);
|
ksft_exit_fail_msg("write to %s failed - %s\n",
|
||||||
|
filename, strerror(errno));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (close(fd) != 0) {
|
if (close(fd) != 0) {
|
||||||
err(1, "close of %s failed", filename);
|
ksft_exit_fail_msg("close of %s failed - %s\n",
|
||||||
|
filename, strerror(errno));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -100,9 +102,10 @@ static bool create_and_enter_ns(uid_t inner_uid)
|
||||||
if (unshare(CLONE_NEWNS) == 0) {
|
if (unshare(CLONE_NEWNS) == 0) {
|
||||||
ksft_print_msg("[NOTE]\tUsing global UIDs for tests\n");
|
ksft_print_msg("[NOTE]\tUsing global UIDs for tests\n");
|
||||||
if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) != 0)
|
if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) != 0)
|
||||||
err(1, "PR_SET_KEEPCAPS");
|
ksft_exit_fail_msg("PR_SET_KEEPCAPS - %s\n",
|
||||||
|
strerror(errno));
|
||||||
if (setresuid(inner_uid, inner_uid, -1) != 0)
|
if (setresuid(inner_uid, inner_uid, -1) != 0)
|
||||||
err(1, "setresuid");
|
ksft_exit_fail_msg("setresuid - %s\n", strerror(errno));
|
||||||
|
|
||||||
// Re-enable effective caps
|
// Re-enable effective caps
|
||||||
capng_get_caps_process();
|
capng_get_caps_process();
|
||||||
|
@ -110,7 +113,8 @@ static bool create_and_enter_ns(uid_t inner_uid)
|
||||||
if (capng_have_capability(CAPNG_PERMITTED, i))
|
if (capng_have_capability(CAPNG_PERMITTED, i))
|
||||||
capng_update(CAPNG_ADD, CAPNG_EFFECTIVE, i);
|
capng_update(CAPNG_ADD, CAPNG_EFFECTIVE, i);
|
||||||
if (capng_apply(CAPNG_SELECT_CAPS) != 0)
|
if (capng_apply(CAPNG_SELECT_CAPS) != 0)
|
||||||
err(1, "capng_apply");
|
ksft_exit_fail_msg(
|
||||||
|
"capng_apply - %s\n", strerror(errno));
|
||||||
|
|
||||||
have_outer_privilege = true;
|
have_outer_privilege = true;
|
||||||
} else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) {
|
} else if (unshare(CLONE_NEWUSER | CLONE_NEWNS) == 0) {
|
||||||
|
@ -121,11 +125,12 @@ static bool create_and_enter_ns(uid_t inner_uid)
|
||||||
|
|
||||||
have_outer_privilege = false;
|
have_outer_privilege = false;
|
||||||
} else {
|
} else {
|
||||||
errx(1, "must be root or be able to create a userns");
|
ksft_exit_skip("must be root or be able to create a userns\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mount("none", "/", NULL, MS_REC | MS_PRIVATE, NULL) != 0)
|
if (mount("none", "/", NULL, MS_REC | MS_PRIVATE, NULL) != 0)
|
||||||
err(1, "remount everything private");
|
ksft_exit_fail_msg("remount everything private - %s\n",
|
||||||
|
strerror(errno));
|
||||||
|
|
||||||
return have_outer_privilege;
|
return have_outer_privilege;
|
||||||
}
|
}
|
||||||
|
@ -134,20 +139,22 @@ static void chdir_to_tmpfs(void)
|
||||||
{
|
{
|
||||||
char cwd[PATH_MAX];
|
char cwd[PATH_MAX];
|
||||||
if (getcwd(cwd, sizeof(cwd)) != cwd)
|
if (getcwd(cwd, sizeof(cwd)) != cwd)
|
||||||
err(1, "getcwd");
|
ksft_exit_fail_msg("getcwd - %s\n", strerror(errno));
|
||||||
|
|
||||||
if (mount("private_tmp", ".", "tmpfs", 0, "mode=0777") != 0)
|
if (mount("private_tmp", ".", "tmpfs", 0, "mode=0777") != 0)
|
||||||
err(1, "mount private tmpfs");
|
ksft_exit_fail_msg("mount private tmpfs - %s\n",
|
||||||
|
strerror(errno));
|
||||||
|
|
||||||
if (chdir(cwd) != 0)
|
if (chdir(cwd) != 0)
|
||||||
err(1, "chdir to private tmpfs");
|
ksft_exit_fail_msg("chdir to private tmpfs - %s\n",
|
||||||
|
strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void copy_fromat_to(int fromfd, const char *fromname, const char *toname)
|
static void copy_fromat_to(int fromfd, const char *fromname, const char *toname)
|
||||||
{
|
{
|
||||||
int from = openat(fromfd, fromname, O_RDONLY);
|
int from = openat(fromfd, fromname, O_RDONLY);
|
||||||
if (from == -1)
|
if (from == -1)
|
||||||
err(1, "open copy source");
|
ksft_exit_fail_msg("open copy source - %s\n", strerror(errno));
|
||||||
|
|
||||||
int to = open(toname, O_CREAT | O_WRONLY | O_EXCL, 0700);
|
int to = open(toname, O_CREAT | O_WRONLY | O_EXCL, 0700);
|
||||||
|
|
||||||
|
@ -157,10 +164,11 @@ static void copy_fromat_to(int fromfd, const char *fromname, const char *toname)
|
||||||
if (sz == 0)
|
if (sz == 0)
|
||||||
break;
|
break;
|
||||||
if (sz < 0)
|
if (sz < 0)
|
||||||
err(1, "read");
|
ksft_exit_fail_msg("read - %s\n", strerror(errno));
|
||||||
|
|
||||||
if (write(to, buf, sz) != sz)
|
if (write(to, buf, sz) != sz)
|
||||||
err(1, "write"); /* no short writes on tmpfs */
|
/* no short writes on tmpfs */
|
||||||
|
ksft_exit_fail_msg("write - %s\n", strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
close(from);
|
close(from);
|
||||||
|
@ -189,7 +197,8 @@ static bool fork_wait(void)
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
err(1, "fork");
|
ksft_exit_fail_msg("fork - %s\n", strerror(errno));
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -199,7 +208,7 @@ static void exec_other_validate_cap(const char *name,
|
||||||
execl(name, name, (eff ? "1" : "0"),
|
execl(name, name, (eff ? "1" : "0"),
|
||||||
(perm ? "1" : "0"), (inh ? "1" : "0"), (ambient ? "1" : "0"),
|
(perm ? "1" : "0"), (inh ? "1" : "0"), (ambient ? "1" : "0"),
|
||||||
NULL);
|
NULL);
|
||||||
err(1, "execl");
|
ksft_exit_fail_msg("execl - %s\n", strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void exec_validate_cap(bool eff, bool perm, bool inh, bool ambient)
|
static void exec_validate_cap(bool eff, bool perm, bool inh, bool ambient)
|
||||||
|
@ -213,7 +222,8 @@ static int do_tests(int uid, const char *our_path)
|
||||||
|
|
||||||
int ourpath_fd = open(our_path, O_RDONLY | O_DIRECTORY);
|
int ourpath_fd = open(our_path, O_RDONLY | O_DIRECTORY);
|
||||||
if (ourpath_fd == -1)
|
if (ourpath_fd == -1)
|
||||||
err(1, "open '%s'", our_path);
|
ksft_exit_fail_msg("open '%s' - %s\n",
|
||||||
|
our_path, strerror(errno));
|
||||||
|
|
||||||
chdir_to_tmpfs();
|
chdir_to_tmpfs();
|
||||||
|
|
||||||
|
@ -225,30 +235,30 @@ static int do_tests(int uid, const char *our_path)
|
||||||
copy_fromat_to(ourpath_fd, "validate_cap",
|
copy_fromat_to(ourpath_fd, "validate_cap",
|
||||||
"validate_cap_suidroot");
|
"validate_cap_suidroot");
|
||||||
if (chown("validate_cap_suidroot", 0, -1) != 0)
|
if (chown("validate_cap_suidroot", 0, -1) != 0)
|
||||||
err(1, "chown");
|
ksft_exit_fail_msg("chown - %s\n", strerror(errno));
|
||||||
if (chmod("validate_cap_suidroot", S_ISUID | 0700) != 0)
|
if (chmod("validate_cap_suidroot", S_ISUID | 0700) != 0)
|
||||||
err(1, "chmod");
|
ksft_exit_fail_msg("chmod - %s\n", strerror(errno));
|
||||||
|
|
||||||
copy_fromat_to(ourpath_fd, "validate_cap",
|
copy_fromat_to(ourpath_fd, "validate_cap",
|
||||||
"validate_cap_suidnonroot");
|
"validate_cap_suidnonroot");
|
||||||
if (chown("validate_cap_suidnonroot", uid + 1, -1) != 0)
|
if (chown("validate_cap_suidnonroot", uid + 1, -1) != 0)
|
||||||
err(1, "chown");
|
ksft_exit_fail_msg("chown - %s\n", strerror(errno));
|
||||||
if (chmod("validate_cap_suidnonroot", S_ISUID | 0700) != 0)
|
if (chmod("validate_cap_suidnonroot", S_ISUID | 0700) != 0)
|
||||||
err(1, "chmod");
|
ksft_exit_fail_msg("chmod - %s\n", strerror(errno));
|
||||||
|
|
||||||
copy_fromat_to(ourpath_fd, "validate_cap",
|
copy_fromat_to(ourpath_fd, "validate_cap",
|
||||||
"validate_cap_sgidroot");
|
"validate_cap_sgidroot");
|
||||||
if (chown("validate_cap_sgidroot", -1, 0) != 0)
|
if (chown("validate_cap_sgidroot", -1, 0) != 0)
|
||||||
err(1, "chown");
|
ksft_exit_fail_msg("chown - %s\n", strerror(errno));
|
||||||
if (chmod("validate_cap_sgidroot", S_ISGID | 0710) != 0)
|
if (chmod("validate_cap_sgidroot", S_ISGID | 0710) != 0)
|
||||||
err(1, "chmod");
|
ksft_exit_fail_msg("chmod - %s\n", strerror(errno));
|
||||||
|
|
||||||
copy_fromat_to(ourpath_fd, "validate_cap",
|
copy_fromat_to(ourpath_fd, "validate_cap",
|
||||||
"validate_cap_sgidnonroot");
|
"validate_cap_sgidnonroot");
|
||||||
if (chown("validate_cap_sgidnonroot", -1, gid + 1) != 0)
|
if (chown("validate_cap_sgidnonroot", -1, gid + 1) != 0)
|
||||||
err(1, "chown");
|
ksft_exit_fail_msg("chown - %s\n", strerror(errno));
|
||||||
if (chmod("validate_cap_sgidnonroot", S_ISGID | 0710) != 0)
|
if (chmod("validate_cap_sgidnonroot", S_ISGID | 0710) != 0)
|
||||||
err(1, "chmod");
|
ksft_exit_fail_msg("chmod - %s\n", strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
capng_get_caps_process();
|
capng_get_caps_process();
|
||||||
|
@ -256,7 +266,7 @@ static int do_tests(int uid, const char *our_path)
|
||||||
/* Make sure that i starts out clear */
|
/* Make sure that i starts out clear */
|
||||||
capng_update(CAPNG_DROP, CAPNG_INHERITABLE, CAP_NET_BIND_SERVICE);
|
capng_update(CAPNG_DROP, CAPNG_INHERITABLE, CAP_NET_BIND_SERVICE);
|
||||||
if (capng_apply(CAPNG_SELECT_CAPS) != 0)
|
if (capng_apply(CAPNG_SELECT_CAPS) != 0)
|
||||||
err(1, "capng_apply");
|
ksft_exit_fail_msg("capng_apply - %s\n", strerror(errno));
|
||||||
|
|
||||||
if (uid == 0) {
|
if (uid == 0) {
|
||||||
ksft_print_msg("[RUN]\tRoot => ep\n");
|
ksft_print_msg("[RUN]\tRoot => ep\n");
|
||||||
|
@ -287,7 +297,7 @@ static int do_tests(int uid, const char *our_path)
|
||||||
capng_update(CAPNG_DROP, CAPNG_PERMITTED, CAP_NET_RAW);
|
capng_update(CAPNG_DROP, CAPNG_PERMITTED, CAP_NET_RAW);
|
||||||
capng_update(CAPNG_DROP, CAPNG_EFFECTIVE, CAP_NET_RAW);
|
capng_update(CAPNG_DROP, CAPNG_EFFECTIVE, CAP_NET_RAW);
|
||||||
if (capng_apply(CAPNG_SELECT_CAPS) != 0)
|
if (capng_apply(CAPNG_SELECT_CAPS) != 0)
|
||||||
err(1, "capng_apply");
|
ksft_exit_fail_msg("capng_apply - %s\n", strerror(errno));
|
||||||
if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, CAP_NET_RAW, 0, 0, 0) != -1 || errno != EPERM) {
|
if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, CAP_NET_RAW, 0, 0, 0) != -1 || errno != EPERM) {
|
||||||
ksft_test_result_fail(
|
ksft_test_result_fail(
|
||||||
"PR_CAP_AMBIENT_RAISE should have failed on a non-permitted cap\n");
|
"PR_CAP_AMBIENT_RAISE should have failed on a non-permitted cap\n");
|
||||||
|
@ -298,7 +308,7 @@ static int do_tests(int uid, const char *our_path)
|
||||||
|
|
||||||
capng_update(CAPNG_ADD, CAPNG_INHERITABLE, CAP_NET_BIND_SERVICE);
|
capng_update(CAPNG_ADD, CAPNG_INHERITABLE, CAP_NET_BIND_SERVICE);
|
||||||
if (capng_apply(CAPNG_SELECT_CAPS) != 0)
|
if (capng_apply(CAPNG_SELECT_CAPS) != 0)
|
||||||
err(1, "capng_apply");
|
ksft_exit_fail_msg("capng_apply - %s\n", strerror(errno));
|
||||||
if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, CAP_NET_BIND_SERVICE, 0, 0, 0) != 0) {
|
if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, CAP_NET_BIND_SERVICE, 0, 0, 0) != 0) {
|
||||||
ksft_test_result_fail(
|
ksft_test_result_fail(
|
||||||
"PR_CAP_AMBIENT_RAISE should have succeeded\n");
|
"PR_CAP_AMBIENT_RAISE should have succeeded\n");
|
||||||
|
@ -312,7 +322,8 @@ static int do_tests(int uid, const char *our_path)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_CLEAR_ALL, 0, 0, 0, 0) != 0)
|
if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_CLEAR_ALL, 0, 0, 0, 0) != 0)
|
||||||
err(1, "PR_CAP_AMBIENT_CLEAR_ALL");
|
ksft_exit_fail_msg("PR_CAP_AMBIENT_CLEAR_ALL - %s\n",
|
||||||
|
strerror(errno));
|
||||||
|
|
||||||
if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_IS_SET, CAP_NET_BIND_SERVICE, 0, 0, 0) != 0) {
|
if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_IS_SET, CAP_NET_BIND_SERVICE, 0, 0, 0) != 0) {
|
||||||
ksft_test_result_fail(
|
ksft_test_result_fail(
|
||||||
|
@ -321,11 +332,12 @@ static int do_tests(int uid, const char *our_path)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, CAP_NET_BIND_SERVICE, 0, 0, 0) != 0)
|
if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, CAP_NET_BIND_SERVICE, 0, 0, 0) != 0)
|
||||||
err(1, "PR_CAP_AMBIENT_RAISE");
|
ksft_exit_fail_msg("PR_CAP_AMBIENT_RAISE - %s\n",
|
||||||
|
strerror(errno));
|
||||||
|
|
||||||
capng_update(CAPNG_DROP, CAPNG_INHERITABLE, CAP_NET_BIND_SERVICE);
|
capng_update(CAPNG_DROP, CAPNG_INHERITABLE, CAP_NET_BIND_SERVICE);
|
||||||
if (capng_apply(CAPNG_SELECT_CAPS) != 0)
|
if (capng_apply(CAPNG_SELECT_CAPS) != 0)
|
||||||
err(1, "capng_apply");
|
ksft_exit_fail_msg("capng_apply - %s\n", strerror(errno));
|
||||||
|
|
||||||
if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_IS_SET, CAP_NET_BIND_SERVICE, 0, 0, 0) != 0) {
|
if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_IS_SET, CAP_NET_BIND_SERVICE, 0, 0, 0) != 0) {
|
||||||
ksft_test_result_fail("Dropping I should have dropped A\n");
|
ksft_test_result_fail("Dropping I should have dropped A\n");
|
||||||
|
@ -336,7 +348,7 @@ static int do_tests(int uid, const char *our_path)
|
||||||
|
|
||||||
capng_update(CAPNG_ADD, CAPNG_INHERITABLE, CAP_NET_BIND_SERVICE);
|
capng_update(CAPNG_ADD, CAPNG_INHERITABLE, CAP_NET_BIND_SERVICE);
|
||||||
if (capng_apply(CAPNG_SELECT_CAPS) != 0)
|
if (capng_apply(CAPNG_SELECT_CAPS) != 0)
|
||||||
err(1, "capng_apply");
|
ksft_exit_fail_msg("capng_apply - %s\n", strerror(errno));
|
||||||
if (uid == 0) {
|
if (uid == 0) {
|
||||||
ksft_print_msg("[RUN]\tRoot +i => eip\n");
|
ksft_print_msg("[RUN]\tRoot +i => eip\n");
|
||||||
if (fork_wait())
|
if (fork_wait())
|
||||||
|
@ -348,7 +360,8 @@ static int do_tests(int uid, const char *our_path)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, CAP_NET_BIND_SERVICE, 0, 0, 0) != 0)
|
if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, CAP_NET_BIND_SERVICE, 0, 0, 0) != 0)
|
||||||
err(1, "PR_CAP_AMBIENT_RAISE");
|
ksft_exit_fail_msg("PR_CAP_AMBIENT_RAISE - %s\n",
|
||||||
|
strerror(errno));
|
||||||
|
|
||||||
ksft_print_msg("[RUN]\tUID %d +ia => eipa\n", uid);
|
ksft_print_msg("[RUN]\tUID %d +ia => eipa\n", uid);
|
||||||
if (fork_wait())
|
if (fork_wait())
|
||||||
|
@ -381,7 +394,8 @@ static int do_tests(int uid, const char *our_path)
|
||||||
ksft_print_msg(
|
ksft_print_msg(
|
||||||
"[RUN]\tRoot, gid != 0, +ia, sgidroot => eip\n");
|
"[RUN]\tRoot, gid != 0, +ia, sgidroot => eip\n");
|
||||||
if (setresgid(1, 1, 1) != 0)
|
if (setresgid(1, 1, 1) != 0)
|
||||||
err(1, "setresgid");
|
ksft_exit_fail_msg("setresgid - %s\n",
|
||||||
|
strerror(errno));
|
||||||
exec_other_validate_cap("./validate_cap_sgidroot",
|
exec_other_validate_cap("./validate_cap_sgidroot",
|
||||||
true, true, true, false);
|
true, true, true, false);
|
||||||
}
|
}
|
||||||
|
@ -399,7 +413,8 @@ static int do_tests(int uid, const char *our_path)
|
||||||
if (fork_wait()) {
|
if (fork_wait()) {
|
||||||
ksft_print_msg("[RUN]\tNon-root +ia, sgidroot => i\n");
|
ksft_print_msg("[RUN]\tNon-root +ia, sgidroot => i\n");
|
||||||
if (setresgid(1, 1, 1) != 0)
|
if (setresgid(1, 1, 1) != 0)
|
||||||
err(1, "setresgid");
|
ksft_exit_fail_msg("setresgid - %s\n",
|
||||||
|
strerror(errno));
|
||||||
exec_other_validate_cap("./validate_cap_sgidroot",
|
exec_other_validate_cap("./validate_cap_sgidroot",
|
||||||
false, false, true, false);
|
false, false, true, false);
|
||||||
}
|
}
|
||||||
|
@ -419,11 +434,11 @@ int main(int argc, char **argv)
|
||||||
/* Find our path */
|
/* Find our path */
|
||||||
tmp1 = strdup(argv[0]);
|
tmp1 = strdup(argv[0]);
|
||||||
if (!tmp1)
|
if (!tmp1)
|
||||||
err(1, "strdup");
|
ksft_exit_fail_msg("strdup - %s\n", strerror(errno));
|
||||||
tmp2 = dirname(tmp1);
|
tmp2 = dirname(tmp1);
|
||||||
our_path = strdup(tmp2);
|
our_path = strdup(tmp2);
|
||||||
if (!our_path)
|
if (!our_path)
|
||||||
err(1, "strdup");
|
ksft_exit_fail_msg("strdup - %s\n", strerror(errno));
|
||||||
free(tmp1);
|
free(tmp1);
|
||||||
|
|
||||||
mpid = getpid();
|
mpid = getpid();
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
#include <cap-ng.h>
|
#include <cap-ng.h>
|
||||||
#include <err.h>
|
|
||||||
#include <linux/capability.h>
|
#include <linux/capability.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -27,8 +26,10 @@ static bool bool_arg(char **argv, int i)
|
||||||
return false;
|
return false;
|
||||||
else if (!strcmp(argv[i], "1"))
|
else if (!strcmp(argv[i], "1"))
|
||||||
return true;
|
return true;
|
||||||
else
|
else {
|
||||||
errx(1, "wrong argv[%d]", i);
|
ksft_exit_fail_msg("wrong argv[%d]\n", i);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
|
@ -41,7 +42,7 @@ int main(int argc, char **argv)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (argc != 5)
|
if (argc != 5)
|
||||||
errx(1, "wrong argc");
|
ksft_exit_fail_msg("wrong argc\n");
|
||||||
|
|
||||||
#ifdef HAVE_GETAUXVAL
|
#ifdef HAVE_GETAUXVAL
|
||||||
if (getauxval(AT_SECURE))
|
if (getauxval(AT_SECURE))
|
||||||
|
|
Loading…
Reference in a new issue