samples/landlock: Format with clang-format
commit 81709f3dcc
upstream.
Let's follow a consistent and documented coding style. Everything may
not be to our liking but it is better than tacit knowledge. Moreover,
this will help maintain style consistency between different developers.
This contains only whitespace changes.
Automatically formatted with:
clang-format-14 -i samples/landlock/*.[ch]
Link: https://lore.kernel.org/r/20220506160513.523257-8-mic@digikod.net
Cc: stable@vger.kernel.org
Signed-off-by: Mickaël Salaün <mic@digikod.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
ace6246919
Коммит
ef35061172
|
@ -22,8 +22,8 @@
|
|||
#include <unistd.h>
|
||||
|
||||
#ifndef landlock_create_ruleset
|
||||
static inline int landlock_create_ruleset(
|
||||
const struct landlock_ruleset_attr *const attr,
|
||||
static inline int
|
||||
landlock_create_ruleset(const struct landlock_ruleset_attr *const attr,
|
||||
const size_t size, const __u32 flags)
|
||||
{
|
||||
return syscall(__NR_landlock_create_ruleset, attr, size, flags);
|
||||
|
@ -33,10 +33,11 @@ static inline int landlock_create_ruleset(
|
|||
#ifndef landlock_add_rule
|
||||
static inline int landlock_add_rule(const int ruleset_fd,
|
||||
const enum landlock_rule_type rule_type,
|
||||
const void *const rule_attr, const __u32 flags)
|
||||
const void *const rule_attr,
|
||||
const __u32 flags)
|
||||
{
|
||||
return syscall(__NR_landlock_add_rule, ruleset_fd, rule_type,
|
||||
rule_attr, flags);
|
||||
return syscall(__NR_landlock_add_rule, ruleset_fd, rule_type, rule_attr,
|
||||
flags);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -79,8 +80,7 @@ static int parse_path(char *env_path, const char ***const path_list)
|
|||
|
||||
/* clang-format on */
|
||||
|
||||
static int populate_ruleset(
|
||||
const char *const env_var, const int ruleset_fd,
|
||||
static int populate_ruleset(const char *const env_var, const int ruleset_fd,
|
||||
const __u64 allowed_access)
|
||||
{
|
||||
int num_paths, i, ret = 1;
|
||||
|
@ -111,12 +111,10 @@ static int populate_ruleset(
|
|||
for (i = 0; i < num_paths; i++) {
|
||||
struct stat statbuf;
|
||||
|
||||
path_beneath.parent_fd = open(path_list[i], O_PATH |
|
||||
O_CLOEXEC);
|
||||
path_beneath.parent_fd = open(path_list[i], O_PATH | O_CLOEXEC);
|
||||
if (path_beneath.parent_fd < 0) {
|
||||
fprintf(stderr, "Failed to open \"%s\": %s\n",
|
||||
path_list[i],
|
||||
strerror(errno));
|
||||
path_list[i], strerror(errno));
|
||||
goto out_free_name;
|
||||
}
|
||||
if (fstat(path_beneath.parent_fd, &statbuf)) {
|
||||
|
@ -128,7 +126,8 @@ static int populate_ruleset(
|
|||
path_beneath.allowed_access &= ACCESS_FILE;
|
||||
if (landlock_add_rule(ruleset_fd, LANDLOCK_RULE_PATH_BENEATH,
|
||||
&path_beneath, 0)) {
|
||||
fprintf(stderr, "Failed to update the ruleset with \"%s\": %s\n",
|
||||
fprintf(stderr,
|
||||
"Failed to update the ruleset with \"%s\": %s\n",
|
||||
path_list[i], strerror(errno));
|
||||
close(path_beneath.parent_fd);
|
||||
goto out_free_name;
|
||||
|
@ -175,16 +174,21 @@ int main(const int argc, char *const argv[], char *const *const envp)
|
|||
};
|
||||
|
||||
if (argc < 2) {
|
||||
fprintf(stderr, "usage: %s=\"...\" %s=\"...\" %s <cmd> [args]...\n\n",
|
||||
fprintf(stderr,
|
||||
"usage: %s=\"...\" %s=\"...\" %s <cmd> [args]...\n\n",
|
||||
ENV_FS_RO_NAME, ENV_FS_RW_NAME, argv[0]);
|
||||
fprintf(stderr, "Launch a command in a restricted environment.\n\n");
|
||||
fprintf(stderr,
|
||||
"Launch a command in a restricted environment.\n\n");
|
||||
fprintf(stderr, "Environment variables containing paths, "
|
||||
"each separated by a colon:\n");
|
||||
fprintf(stderr, "* %s: list of paths allowed to be used in a read-only way.\n",
|
||||
fprintf(stderr,
|
||||
"* %s: list of paths allowed to be used in a read-only way.\n",
|
||||
ENV_FS_RO_NAME);
|
||||
fprintf(stderr, "* %s: list of paths allowed to be used in a read-write way.\n",
|
||||
fprintf(stderr,
|
||||
"* %s: list of paths allowed to be used in a read-write way.\n",
|
||||
ENV_FS_RW_NAME);
|
||||
fprintf(stderr, "\nexample:\n"
|
||||
fprintf(stderr,
|
||||
"\nexample:\n"
|
||||
"%s=\"/bin:/lib:/usr:/proc:/etc:/dev/urandom\" "
|
||||
"%s=\"/dev/null:/dev/full:/dev/zero:/dev/pts:/tmp\" "
|
||||
"%s bash -i\n",
|
||||
|
@ -192,20 +196,23 @@ int main(const int argc, char *const argv[], char *const *const envp)
|
|||
return 1;
|
||||
}
|
||||
|
||||
ruleset_fd = landlock_create_ruleset(&ruleset_attr, sizeof(ruleset_attr), 0);
|
||||
ruleset_fd =
|
||||
landlock_create_ruleset(&ruleset_attr, sizeof(ruleset_attr), 0);
|
||||
if (ruleset_fd < 0) {
|
||||
const int err = errno;
|
||||
|
||||
perror("Failed to create a ruleset");
|
||||
switch (err) {
|
||||
case ENOSYS:
|
||||
fprintf(stderr, "Hint: Landlock is not supported by the current kernel. "
|
||||
fprintf(stderr,
|
||||
"Hint: Landlock is not supported by the current kernel. "
|
||||
"To support it, build the kernel with "
|
||||
"CONFIG_SECURITY_LANDLOCK=y and prepend "
|
||||
"\"landlock,\" to the content of CONFIG_LSM.\n");
|
||||
break;
|
||||
case EOPNOTSUPP:
|
||||
fprintf(stderr, "Hint: Landlock is currently disabled. "
|
||||
fprintf(stderr,
|
||||
"Hint: Landlock is currently disabled. "
|
||||
"It can be enabled in the kernel configuration by "
|
||||
"prepending \"landlock,\" to the content of CONFIG_LSM, "
|
||||
"or at boot time by setting the same content to the "
|
||||
|
@ -219,7 +226,8 @@ int main(const int argc, char *const argv[], char *const *const envp)
|
|||
goto err_close_ruleset;
|
||||
}
|
||||
if (populate_ruleset(ENV_FS_RW_NAME, ruleset_fd,
|
||||
ACCESS_FS_ROUGHLY_READ | ACCESS_FS_ROUGHLY_WRITE)) {
|
||||
ACCESS_FS_ROUGHLY_READ |
|
||||
ACCESS_FS_ROUGHLY_WRITE)) {
|
||||
goto err_close_ruleset;
|
||||
}
|
||||
if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче