fix arm build

Author: anwayde

src/app/shared/commands/run/generated/pidns.arm64_seccomp.h renamed to src/app/shared/commands/run/generated/pidns_arm64_seccomp.h

@@ -21,9 +21,9 @@
 #else
 # error "Target architecture is unsupported by seccomp."
 #endif
-static const unsigned int sock_filter_policy_pidns.arm64_instr_cnt = 23;
+static const unsigned int sock_filter_policy_pidns_arm64_instr_cnt = 23;
 
-static void populate_sock_filter_policy_pidns.arm64( ulong out_cnt, struct sock_filter * out, unsigned int logfile_fd) {
+static void populate_sock_filter_policy_pidns_arm64( ulong out_cnt, struct sock_filter * out, unsigned int logfile_fd) {
   FD_TEST( out_cnt >= 23 );
   struct sock_filter filter[23] = {
     /* Check: Jump to RET_KILL_PROCESS if the script's arch != the runtime arch */

src/app/shared/commands/run/pidns.arm64.seccomppolicy renamed to src/app/shared/commands/run/pidns_arm64.seccomppolicy

@@ -4,7 +4,7 @@
 #include <sys/wait.h>
 #include "generated/main_seccomp.h"
 #if defined(__aarch64__)
-#include "generated/pidns.arm64_seccomp.h"
+#include "generated/pidns_arm64_seccomp.h"
 #else
 #include "generated/pidns_seccomp.h"
 #endif
@@ -336,7 +336,14 @@ main_pid_namespace( void * _args ) {
     allow_fds[ allow_fds_cnt++ ] = fds[ i ].fd; /* read end of child pipes */
 
   struct sock_filter seccomp_filter[ 128UL ];
+  unsigned int instr_cnt;
+  #if defined(__aarch64__)
+  populate_sock_filter_policy_pidns_arm64( 128UL, seccomp_filter, (uint)fd_log_private_logfile_fd() );
+  instr_cnt = sock_filter_policy_pidns_arm64_instr_cnt;
+  #else
   populate_sock_filter_policy_pidns( 128UL, seccomp_filter, (uint)fd_log_private_logfile_fd() );
+  instr_cnt = sock_filter_policy_pidns_instr_cnt;
+  #endif
 
   if( FD_LIKELY( config->development.sandbox ) ) {
     fd_sandbox_enter( config->uid,
@@ -350,7 +357,7 @@ main_pid_namespace( void * _args ) {
                       0UL,
                       allow_fds_cnt,
                       allow_fds,
-                      sock_filter_policy_pidns_instr_cnt,
+                      instr_cnt,
                       seccomp_filter );
   } else {
     fd_sandbox_switch_uid_gid( config->uid, config->gid );
@@ -783,7 +790,7 @@ run_firedancer( config_t * config,
 
   run_firedancer_init( config, init_workspaces );
 
-#if defined(__x86_64__)
+#if defined(__x86_64__) || defined(__aarch64__)
 
 #ifndef SYS_landlock_create_ruleset
 #define SYS_landlock_create_ruleset 444

src/app/shared/commands/run/run.c

@@ -11,7 +11,7 @@
 
 #include <sys/socket.h> /* SOCK_CLOEXEC, SOCK_NONBLOCK needed for seccomp filter */
 #if defined(__aarch64__)
-#include "generated/fd_gui_tile.arm64_seccomp.h"
+#include "generated/fd_gui_tile_arm64_seccomp.h"
 #else
 #include "generated/fd_gui_tile_seccomp.h"
 #endif

src/disco/gui/fd_gui_tile.c

@@ -21,9 +21,9 @@
 #else
 # error "Target architecture is unsupported by seccomp."
 #endif
-static const unsigned int sock_filter_policy_fd_gui_tile.arm64_instr_cnt = 45;
+static const unsigned int sock_filter_policy_fd_gui_tile_arm64_instr_cnt = 45;
 
-static void populate_sock_filter_policy_fd_gui_tile.arm64( ulong out_cnt, struct sock_filter * out, unsigned int logfile_fd, unsigned int gui_socket_fd) {
+static void populate_sock_filter_policy_fd_gui_tile_arm64( ulong out_cnt, struct sock_filter * out, unsigned int logfile_fd, unsigned int gui_socket_fd) {
   FD_TEST( out_cnt >= 45 );
   struct sock_filter filter[45] = {
     /* Check: Jump to RET_KILL_PROCESS if the script's arch != the runtime arch */

src/disco/gui/fd_gui_tile.arm64.seccomppolicy renamed to src/disco/gui/fd_gui_tile_arm64.seccomppolicy

@@ -8,7 +8,7 @@
 #include <string.h>
 
 #if defined(__aarch64__)
-#include "generated/fd_metric_tile.arm64_seccomp.h"
+#include "generated/fd_metric_tile_arm64_seccomp.h"
 #else
 #include "generated/fd_metric_tile_seccomp.h"
 #endif

src/disco/gui/generated/fd_gui_tile.arm64_seccomp.h renamed to src/disco/gui/generated/fd_gui_tile_arm64_seccomp.h

@@ -21,9 +21,9 @@
 #else
 # error "Target architecture is unsupported by seccomp."
 #endif
-static const unsigned int sock_filter_policy_fd_metric_tile.arm64_instr_cnt = 45;
+static const unsigned int sock_filter_policy_fd_metric_tile_arm64_instr_cnt = 45;
 
-static void populate_sock_filter_policy_fd_metric_tile.arm64( ulong out_cnt, struct sock_filter * out, unsigned int logfile_fd, unsigned int metrics_socket_fd) {
+static void populate_sock_filter_policy_fd_metric_tile_arm64( ulong out_cnt, struct sock_filter * out, unsigned int logfile_fd, unsigned int metrics_socket_fd) {
   FD_TEST( out_cnt >= 45 );
   struct sock_filter filter[45] = {
     /* Check: Jump to RET_KILL_PROCESS if the script's arch != the runtime arch */