Change project name to avoid conflict with the pmem/syscall_intercept library

Author: axtloss

.gitignore

@@ -6,3 +6,5 @@ config.log
 src/Makefile
 src/syscall_intercept
 src/.libs
+src/syscall.h
+src/unistd_64.h

config.yml

@@ -1,15 +1,15 @@
-log_file: /dev/kmsg
+log_file: /dev/log
 syscalls:
     - umount2:
         log: true
         block: true
         arg0: "/usr"
         arg1: "rw"
-    - remove:
+    - mount:
         log: false
         block: true
         arg0: "/etc/important"
-    - remove:
+    - fsmount:
         log: true
         block: false
         arg0: "/etc/abroot.conf"

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for syscall_intercept 1.0.
+# Generated by GNU Autoconf 2.71 for syscall_interceptor 1.0.
 #
 # Report bugs to <axtlos@disroot.org>.
 #
@@ -619,10 +619,10 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='syscall_intercept'
-PACKAGE_TARNAME='syscall_intercept'
+PACKAGE_NAME='syscall_interceptor'
+PACKAGE_TARNAME='syscall_interceptor'
 PACKAGE_VERSION='1.0'
-PACKAGE_STRING='syscall_intercept 1.0'
+PACKAGE_STRING='syscall_interceptor 1.0'
 PACKAGE_BUGREPORT='axtlos@disroot.org'
 PACKAGE_URL=''
 
@@ -1350,7 +1350,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures syscall_intercept 1.0 to adapt to many kinds of systems.
+\`configure' configures syscall_interceptor 1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1400,7 +1400,7 @@ Fine tuning of the installation directories:
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
   --docdir=DIR            documentation root
-                          [DATAROOTDIR/doc/syscall_intercept]
+                          [DATAROOTDIR/doc/syscall_interceptor]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1422,7 +1422,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of syscall_intercept 1.0:";;
+     short | recursive ) echo "Configuration of syscall_interceptor 1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1532,7 +1532,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-syscall_intercept configure 1.0
+syscall_interceptor configure 1.0
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1750,7 +1750,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by syscall_intercept $as_me 1.0, which was
+It was created by syscall_interceptor $as_me 1.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -12303,7 +12303,7 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE='syscall_intercept'
+ PACKAGE='syscall_interceptor'
  VERSION='1.0'
 
 
@@ -14162,7 +14162,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by syscall_intercept $as_me 1.0, which was
+This file was extended by syscall_interceptor $as_me 1.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14230,7 +14230,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-syscall_intercept config.status 1.0
+syscall_interceptor config.status 1.0
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([syscall_intercept], [1.0], [axtlos@disroot.org])
+AC_INIT([syscall_interceptor], [1.0], [axtlos@disroot.org])
 LT_INIT
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_CONFIG_MACRO_DIRS([m4])

libtool

@@ -1,5 +1,5 @@
 #! /bin/sh
-# Generated automatically by config.status (syscall_intercept) 1.0
+# Generated automatically by config.status (syscall_interceptor) 1.0
 # Libtool was configured on host bonsai:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 

parse_config.sh

@@ -16,11 +16,12 @@ header_template = """
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
+#include <sys/syscall.h>
 
 #define LOG_FILE "{PYLOGFILE}"
 
 struct syscall {{
-  char *name; // TODO: change to long
+  long callnum;
   bool log;
   bool block;
   char *arg0;
@@ -44,7 +45,7 @@ return {FIRSTVARNAME};
 
 structbuild_template = {
     "var_define": "struct syscall *{varname} = (struct syscall *) malloc(sizeof(struct syscall));\n",
-    "set_name": '{varname}->name = (char *) malloc(strlen("{name}")+1);\nstrcpy({varname}->name, "{name}");\n',
+    "set_name": '{varname}->callnum = {name};\n',
     "set_log": "{varname}->log = {log};\n",
     "set_block": "{varname}->block = {block};\n",
     "set_arg": '{varname}->{argname} = (char *) malloc(strlen("{arg}")+1);\nstrcpy({varname}->{argname}, "{arg}");\n',
@@ -88,14 +89,21 @@ class Syscall:
 
     def build_c_code(self, varname: str) -> str:
         c_code = structbuild_template["var_define"].format(varname=varname)
-        c_code = c_code + structbuild_template["set_name"].format(
-            varname=varname, name=self.name
-        )
+        if self.name.startswith("SYS_"):
+            c_code = c_code + structbuild_template["set_name"].format(
+                varname=varname, name=self.name.lower()
+            )
+        else:
+            c_code = c_code + structbuild_template["set_name"].format(
+                varname=varname, name="SYS_"+self.name.lower()
+            )
+
+
         c_code = c_code + structbuild_template["set_log"].format(
-            varname=varname, log=self.log
+            varname=varname, log=str(self.log).lower()
         )
         c_code = c_code + structbuild_template["set_block"].format(
-            varname=varname, block=self.block
+            varname=varname, block=str(self.block).lower()
         )
         if self.arg0 != "":
             c_code = c_code + structbuild_template["set_arg"].format(

src/Makefile.am

@@ -1,5 +1,8 @@
-lib_LTLIBRARIES = libsyscall_intercept.la
-libsyscall_intercept_la_SOURCES = main.c
-libsyscall_intercept_la_CFLAGS = -fpic
-libsyscall_intercept_la_LDFLAGS = -version-info 1:0:0
+bin_PROGRAMS = syscall_interceptor
+syscall_interceptor_SOURCES = main.c
+
+lib_LTLIBRARIES = libsyscall_interceptor.la
+libsyscall_interceptor_la_SOURCES = main.c
+libsyscall_interceptor_la_CFLAGS = -fpic
+libsyscall_interceptor_la_LDFLAGS = -version-info 1:0:0
 

src/main.c

@@ -1,10 +1,51 @@
 #include <config.h>
+#include <calls.h>
+#include <limits.h>
 #include <stdio.h>
+#include <libsyscall_intercept_hook_point.h>
+#include <syscall.h>
+#include <errno.h>
+#include <strings.h>
+
+static int
+hook (long syscall_number,
+      long arg0, long arg1,
+      long arg2, long arg3,
+      long arg4, long arg5,
+      long *result) {
+
+  struct syscall *calls = get_calls();
+  struct syscall *curr_call = calls;
+  while(true) {
+    if (curr_call->callnum == syscall_number) {
+      //      puts ((char*) arg0);
+      puts("here");
+      *result = -ENOTSUP;
+      return 0;
+    }
+    if (!curr_call->next) {
+      return 1;
+    }
+    curr_call = curr_call->next;
+  }
+}
+
+static __attribute__((constructor)) void
+init(void) {
+  intercept_hook_point = hook;
+}
 
 int
 main (void)
 {
+  struct syscall *calls = get_calls();
+
   puts ("Hello World!");
   puts ("This is " PACKAGE_STRING ".");
+  puts (LOG_FILE);
+  //  printf ("%ld", calls->callnum);
+  long *result = (long *) malloc(LONG_MAX);
+  hook(SYS_umount2, 0, 0, 0, 0, 0, 0, result);
+  printf("%ld", *result);
   return 0;
 }