heartbeat - move seccomp customization to InitializeModule #39763
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Move the overwriting of the arm64 seccomp policy out of the Go init() phase and into a function call that is specific to Heartbeat. This will prevent Heartbeat's policy from affecting all other Beats that run as part of Agentbeat. Note that other customizations from all Beats that use seccomp.ModifyDefaultPolicy within init() are being combined in Agentbeat to create a policy that is the aggregation of all seccomp customizations. So the allow-list type policies are likely more permissive than expected. Fixes elastic#39754
botelastic
bot
added
the
needs_team
|
This pull request does not have a backport label.
To fixup this pull request, you need to add the backport labels for the needed
|
andrewkroh
added
the
Team:obs-ds-hosted-services
|
Pinging @elastic/obs-ds-hosted-services (Team:obs-ds-hosted-services) |
botelastic
bot
removed
the
needs_team
pkoutsovasilis
approved these changes
May 29, 2024
mergify bot
pushed a commit
that referenced
this pull request
May 29, 2024
Move the overwriting of the arm64 seccomp policy out of the Go init() phase and into a function call that is specific to Heartbeat. This will prevent Heartbeat's policy from affecting all other Beats that run as part of Agentbeat. Note that other customizations from all Beats that use seccomp.ModifyDefaultPolicy within init() are still being combined in Agentbeat to create a policy that is the aggregation of all seccomp customizations. So the allow-list type policies are likely more permissive than expected. Fixes #39754 (cherry picked from commit 48a9901)
6 tasks
andrewkroh
added a commit
that referenced
this pull request
May 31, 2024
…39764) Move the overwriting of the arm64 seccomp policy out of the Go init() phase and into a function call that is specific to Heartbeat. This will prevent Heartbeat's policy from affecting all other Beats that run as part of Agentbeat. Note that other customizations from all Beats that use seccomp.ModifyDefaultPolicy within init() are still being combined in Agentbeat to create a policy that is the aggregation of all seccomp customizations. So the allow-list type policies are likely more permissive than expected. Fixes #39754 (cherry picked from commit 48a9901) Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed commit message
Move the overwriting of the arm64 seccomp policy out of the Go init() phase and into a function call that is specific to Heartbeat. This will prevent Heartbeat's policy from affecting all other Beats that run as part of Agentbeat.
Note that other customizations from all Beats that use seccomp.ModifyDefaultPolicy within init() are still being combined in Agentbeat to create a policy that is the aggregation of all seccomp customizations. So the allow-list type policies are likely more permissive than expected.
Fixes #39754
Checklist
CHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.How to test this PR locally
Related issues
Logs
Heartbeat on arm64:
{ "@timestamp": "2024-05-29T19:17:59.332Z", "ecs.version": "1.6.0", "log.level": "debug", "log.logger": "seccomp", "log.origin": { "file.line": 118, "file.name": "seccomp/seccomp.go", "function": "github.com/elastic/beats/v7/libbeat/common/seccomp.loadFilter" }, "message": "Loading syscall filter", "seccomp_filter": { "flag": "tsync", "no_new_privs": true, "policy": { "default_action": "errno", "syscalls": [ { "action": "allow", "names": [ "accept", "accept4", "bind", "brk", "capget", "capset", "chdir", "clock_gettime", "clone", "clone3", "close", "connect", "dup", "dup3", "epoll_create1", "epoll_ctl", "epoll_pwait", "eventfd2", "execve", "exit", "exit_group", "faccessat", "fadvise64", "fallocate", "fchdir", "fchmod", "fchmodat", "fchown", "fchownat", "fcntl", "fdatasync", "flock", "fstat", "fstatat", "fstatfs", "fsync", "ftruncate", "futex", "getcwd", "getdents64", "getegid", "geteuid", "getgid", "getgroups", "getpeername", "getpgid", "getpid", "getppid", "getpriority", "getrandom", "getresgid", "getresuid", "getrlimit", "getrusage", "getsockname", "getsockopt", "gettid", "gettimeofday", "getuid", "inotify_add_watch", "inotify_init1", "inotify_rm_watch", "ioctl", "kill", "linkat", "listen", "lseek", "madvise", "memfd_create", "mincore", "mkdirat", "mlock", "mmap", "mprotect", "munmap", "name_to_handle_at", "nanosleep", "openat", "pipe2", "ppoll", "prctl", "pread64", "prlimit64", "pselect6", "pwrite64", "read", "readlinkat", "recvfrom", "recvmmsg", "recvmsg", "renameat", "rseq", "rt_sigaction", "rt_sigprocmask", "rt_sigreturn", "sched_getaffinity", "sched_getattr", "sched_getparam", "sched_getscheduler", "sched_setaffinity", "sched_setattr", "sched_yield", "seccomp", "sendfile", "sendmmsg", "sendmsg", "sendto", "set_robust_list", "set_tid_address", "setgid", "setgroups", "setitimer", "setpriority", "setsid", "setsockopt", "setuid", "shutdown", "sigaltstack", "socket", "socketpair", "splice", "statfs", "statx", "symlinkat", "sysinfo", "tgkill", "tkill", "umask", "uname", "unlinkat", "utimensat", "wait4", "waitid", "write", "writev" ], "names_with_args": null } ] } }, "service.name": "heartbeat" }