5 files changed, 287 insertions, 6 deletions

diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 91bb420b6..e79cc4a2c 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -109,9 +109,10 @@ typedef struct config_t {
 
         // seccomp
         char *seccomp_list;//  optional seccomp list on top of default filter
-        char *seccomp_list_drop;                // seccomp drop list
-        char *seccomp_list_keep;                // seccomp keep list
-        char **seccomp_list_errno;              // seccomp errno[nr] lists
+        char *seccomp_list_drop;        // seccomp drop list
+        char *seccomp_list_keep;        // seccomp keep list
+        char **seccomp_list_errno;      // seccomp errno[nr] lists
+        char *protocol;                 // protocol list
 
         // rlimits
         unsigned rlimit_nofile;
@@ -357,7 +358,7 @@ void caps_print_filter_name(const char *name);
 const char *syscall_find_nr(int nr);
 // return -1 if error, 0 if no error
 int syscall_check_list(const char *slist, void (*callback)(int syscall, int arg), int arg);
-// print all available syscalls
+// print all available syscallsseccomp
 void syscall_print(void);
 
 // fs_trace.c
@@ -427,5 +428,11 @@ void pulseaudio_disable(void);
 void fs_check_bin_list(void);
 void fs_private_bin_list(void);
 
+// protocol.c
+void protocol_list();
+void protocol_print_filter_name(const char *name);
+void protocol_print_filter(pid_t pid);
+void protocol_store(const char *prlist);
+void protocol_filter(void);
 #endif
 
diff --git a/src/firejail/main.c b/src/firejail/main.c
index b59ff699c..e39a41502 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -308,7 +308,7 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                 exit(0);
         }
         else if (strncmp(argv[i], "--seccomp.print=", 16) == 0) {
-                // join sandbox by pid or by name
+                // print seccomp filter for a sandbox specified by pid or by name
                 pid_t pid;
                 if (read_pid(argv[i] + 16, &pid) == 0)          
                         seccomp_print_filter(pid);
@@ -316,6 +316,19 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                         seccomp_print_filter_name(argv[i] + 16);
                 exit(0);
         }
+        else if (strcmp(argv[i], "--debug-protocols") == 0) {
+                protocol_list();
+                exit(0);
+        }
+        else if (strncmp(argv[i], "--protocol.print=", 17) == 0) {
+                // print seccomp filter for a sandbox specified by pid or by name
+                pid_t pid;
+                if (read_pid(argv[i] + 17, &pid) == 0)          
+                        protocol_print_filter(pid);
+                else
+                        protocol_print_filter_name(argv[i] + 17);
+                exit(0);
+        }
 #endif
         else if (strncmp(argv[i], "--caps.print=", 13) == 0) {
                 // join sandbox by pid or by name
@@ -451,6 +464,8 @@ int main(int argc, char **argv) {
                 // filtering
                 //*************************************
 #ifdef HAVE_SECCOMP
+                else if (strncmp(argv[i], "--protocol=", 11) == 0) 
+                        protocol_store(argv[i] + 11);
                 else if (strcmp(argv[i], "--seccomp") == 0) {
                         if (arg_seccomp) {
                                 fprintf(stderr, "Error: seccomp already enabled\n");
diff --git a/src/firejail/protocol.c b/src/firejail/protocol.c
new file mode 100644
index 000000000..098661339
--- /dev/null
+++ b/src/firejail/protocol.c
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2014, 2015 Firejail Authors
+ *
+ * This file is part of firejail project
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifdef HAVE_SECCOMP
+#include "firejail.h"
+#include "seccomp.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+
+static char *protocol[] = {
+        "unix",
+        "inet",
+        "inet6",
+        "netlink",
+        "packet",
+        NULL
+};
+
+static struct sock_filter protocol_filter_command[] = {
+        WHITELIST(AF_UNIX),
+        WHITELIST(AF_INET),
+        WHITELIST(AF_INET6),
+        WHITELIST(AF_NETLINK),
+        WHITELIST(AF_PACKET)
+};
+// Note: protocol[] and protocol_filter_command are synchronized
+
+// command length
+struct sock_filter whitelist[] = {
+        WHITELIST(AF_UNIX)
+};
+unsigned whitelist_len = sizeof(whitelist) / sizeof(struct sock_filter);
+
+
+
+static int is_protocol(const char *p) {
+        int i = 0;
+        while (protocol[i] != NULL) {
+                if (strcmp(protocol[i], p) == 0)
+                        return 1;
+                i++;
+        }
+
+        return 0;
+}       
+
+static struct sock_filter *find_protocol_domain(const char *p) {
+        int i = 0;
+        while (protocol[i] != NULL) {
+                if (strcmp(protocol[i], p) == 0)
+                        return &protocol_filter_command[i * whitelist_len];
+                i++;
+        }
+
+        return NULL;
+}       
+
+// --debug-protocols
+void protocol_list(void) {
+        int i = 0;
+        while (protocol[i] != NULL) {
+                printf("%s, ", protocol[i]);
+                i++;
+        }
+        printf("\n");
+}
+
+// --protocol.print
+void protocol_print_filter_name(const char *name) {
+        (void) name;
+//todo
+}
+
+// --protocol.print
+void protocol_print_filter(pid_t pid) {
+        (void) pid;
+//todo
+}
+
+// check protocol list and store it in cfg structure
+void protocol_store(const char *prlist) {
+        assert(prlist);
+        
+        // temporary list
+        char *tmplist = strdup(prlist);
+        if (!tmplist)
+                errExit("strdup");
+        
+        // check list
+        char *token = strtok(tmplist, ",");
+        if (!token)
+                goto errout;
+                
+        while (token) {
+                if (!is_protocol(token))
+                        goto errout;
+                token = strtok(NULL, ",");
+        }       
+        free(tmplist);
+        
+        // store list
+        cfg.protocol = strdup(prlist);
+        if (!cfg.protocol)
+                errExit("strdup");
+        return;
+                
+errout:
+        fprintf(stderr, "Error: invalid protocol list\n");
+        exit(1);
+}       
+
+// install protocol filter
+void protocol_filter(void) {
+        assert(cfg.protocol);
+        
+        // build the filter
+        
+        struct sock_filter filter[32];  // big enough
+        memset(&filter[0], 0, sizeof(filter));
+        uint8_t *ptr = (uint8_t *) &filter[0];
+        
+        // header
+        struct sock_filter filter_start[] = {
+                VALIDATE_ARCHITECTURE,
+                EXAMINE_SYSCALL,
+                ONLY(SYS_socket),
+                EXAMINE_ARGUMENT(0)
+        };
+        memcpy(ptr, &filter_start[0], sizeof(filter_start));
+        ptr += sizeof(filter_start);
+
+#if 0
+printf("entries %u\n", (unsigned) (sizeof(filter_start) / sizeof(struct sock_filter)));
+{
+        unsigned j;
+        unsigned char *ptr2 = (unsigned char *) &filter[0];
+        for (j = 0; j < sizeof(filter); j++, ptr2++) {
+                if ((j % (sizeof(struct sock_filter))) == 0)
+                        printf("\n%u: ", 1 + (unsigned) (j / (sizeof(struct sock_filter))));
+                printf("%02x, ", (*ptr2) & 0xff);
+        }
+        printf("\n");
+}
+#endif
+
+printf("whitelist_len %u, struct sock_filter len %u\n", whitelist_len, (unsigned) sizeof(struct sock_filter));
+
+        // parse list and add commands
+        char *tmplist = strdup(cfg.protocol);
+        if (!tmplist)
+                errExit("strdup");
+        char *token = strtok(tmplist, ",");
+        if (!token)
+                errExit("strtok");
+                
+        while (token) {
+                struct sock_filter *domain = find_protocol_domain(token);
+                assert(domain);
+                memcpy(ptr, domain, whitelist_len * sizeof(struct sock_filter));
+                ptr += whitelist_len * sizeof(struct sock_filter);
+                token = strtok(NULL, ",");
+
+#if 0
+printf("entries %u\n",  (unsigned) ((uint64_t) ptr - (uint64_t) (filter)) / (unsigned) sizeof(struct sock_filter));
+{
+        unsigned j;
+        unsigned char *ptr2 = (unsigned char *) &filter[0];
+        for (j = 0; j < sizeof(filter); j++, ptr2++) {
+                if ((j % (sizeof(struct sock_filter))) == 0)
+                        printf("\n%u: ", 1 + (unsigned) (j / (sizeof(struct sock_filter))));
+                printf("%02x, ", (*ptr2) & 0xff);
+        }
+        printf("\n");
+}
+#endif
+
+
+        }       
+        free(tmplist);
+
+        // add end of filter
+        struct sock_filter filter_end[] = {
+                RETURN_ERRNO(ENOTSUP)
+        };
+        memcpy(ptr, &filter_end[0], sizeof(filter_end));
+        ptr += sizeof(filter_end);
+
+#if 0
+printf("entries %u\n",  (unsigned) ((uint64_t) ptr - (uint64_t) (filter)) / (unsigned) sizeof(struct sock_filter));
+{
+        unsigned j;
+        unsigned char *ptr2 = (unsigned char *) &filter[0];
+        for (j = 0; j < sizeof(filter); j++, ptr2++) {
+                if ((j % (sizeof(struct sock_filter))) == 0)
+                        printf("\n%u: ", 1 + (unsigned) (j / (sizeof(struct sock_filter))));
+                printf("%02x, ", (*ptr2) & 0xff);
+        }
+        printf("\n");
+}
+#endif  
+
+        // install filter
+        unsigned short entries = (unsigned short) ((uint64_t) ptr - (uint64_t) (filter)) / (unsigned) sizeof(struct sock_filter);
+        struct sock_fprog prog = {
+                .len = entries,
+                .filter = filter,
+        };
+
+        if (prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &prog) || prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)) {
+                fprintf(stderr, "Warning: seccomp disabled, it requires a Linux kernel version 3.5 or newer.\n");
+                return;
+        }
+        else if (arg_debug) {
+                printf("seccomp protocol filter enabled\n");
+        }
+
+#if defined(__x86_64__)
+        
+#endif
+        
+}
+
+#endif
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index d2c943ea1..427b3fc09 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -426,6 +426,11 @@ int sandbox(void* sandbox_arg) {
 
         // set seccomp
 #ifdef HAVE_SECCOMP
+        // install protocol filter
+        if (cfg.protocol) {
+                protocol_filter();              
+        }
+
         // if a keep list is available, disregard the drop list
         if (arg_seccomp == 1) {
                 if (cfg.seccomp_list_keep)
diff --git a/src/firejail/seccomp.h b/src/firejail/seccomp.h
index 19684d4a9..b83fe87ce 100644
--- a/src/firejail/seccomp.h
+++ b/src/firejail/seccomp.h
@@ -92,15 +92,26 @@ struct seccomp_data {
 # define ARCH_NR        0
 #endif
 
-
 #define VALIDATE_ARCHITECTURE \
      BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
      BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_NR, 1, 0), \
      BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
 
+#define VALIDATE_ARCHITECTURE_32_64 \
+     BPF_STMT(BPF_LD+BPF_W+BPF_ABS, (offsetof(struct seccomp_data, arch))), \
+     BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, ARCH_NR, 1, 0), \
+     BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
+
 #define EXAMINE_SYSCALL BPF_STMT(BPF_LD+BPF_W+BPF_ABS,  \
                  (offsetof(struct seccomp_data, nr)))
 
+#define EXAMINE_ARGUMENT(nr) BPF_STMT(BPF_LD+BPF_W+BPF_ABS,     \
+                 (offsetof(struct seccomp_data, args[nr])))
+
+#define ONLY(syscall_nr)        \
+        BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, syscall_nr, 1, 0),      \
+        BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
+
 #define BLACKLIST(syscall_nr)   \
         BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, syscall_nr, 0, 1),      \
         BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_KILL)
@@ -116,6 +127,9 @@ struct seccomp_data {
 #define RETURN_ALLOW \
         BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)
 
+#define RETURN_ERRNO(nr) \
+        BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ERRNO | nr)
+
 #define KILL_PROCESS \
         BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_KILL)