seccomp-tools 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52d71ec73ddfa5dab7d22d982b27b2d4c3610080
-  data.tar.gz: '08439390a2e4a08d8619eba08b7b66a2814372b1'
+  metadata.gz: e486ade31fe2b1da262f3636060b4d0b3947fb29
+  data.tar.gz: c65f8074f25cb4b3806726a04d2c2377d44b3ec4
 SHA512:
-  metadata.gz: c69c741edae030e7a775dcad768fa983c627cda1d849947c079d45148453a018cbba249abd18faced059b4c4cdc793e746d707e178b2e845804e7bb9a4c70437
-  data.tar.gz: fc8cc5926cba54d561822b3a75b57c8721b1113ef16117f455c8a91f651dbad16ced7f6e09209d2adcd7a8183f4a1f8d327aa490652fe5f8ee7a3be187fe361a
+  metadata.gz: 4fbb16ae849bcfc0d17eb8bbcb36f4e7906adb3da00f8bcc31712b69a299e3d3a4f659227e1668f8809433f5c4805170fd79e4934c174a4c455438bca6973361
+  data.tar.gz: a3aba5b768d38fe50f4533a60f7f9cc9d592429803a17728101f721d1aaaf767fcec270ffe59d08bd36763e542e48af48774a707d30dcba71d3920fc6a05123c

data/README.md

@@ -38,19 +38,20 @@ $ seccomp-tools --help
 #
 # List of commands:
 #
-# 	dump	Automatically dump seccomp bpf from execution file.
-# 	disasm	Disassemble seccomp bpf.
 # 	asm	Seccomp bpf assembler.
+# 	disasm	Disassemble seccomp bpf.
+# 	dump	Automatically dump seccomp bpf from execution file.
 # 	emu	Emulate seccomp rules.
 #
-# See 'seccomp-tools --help <command>' to read about a specific subcommand.
+# See 'seccomp-tools <command> --help' to read about a specific subcommand.
 
-$ seccomp-tools --help dump
+$ seccomp-tools dump --help
 # dump - Automatically dump seccomp bpf from execution file.
 #
 # Usage: seccomp-tools dump [exec] [options]
 #     -c, --sh-exec <command>          Executes the given command (via sh).
 #                                      Use this option if want to pass arguments or do pipe things to the execution file.
+#                                      e.g. use `-c "./bin > /dev/null"` to dump seccomp without being mixed with stdout.
 #     -f, --format FORMAT              Output format. FORMAT can only be one of <disasm|raw|inspect>.
 #                                      Default: disasm
 #     -l, --limit LIMIT                Limit the number of calling "prctl(PR_SET_SECCOMP)".
@@ -197,7 +198,7 @@ $ seccomp-tools asm spec/data/libseccomp.asm -f raw | seccomp-tools disasm -
 #  0005: 0x15 0x03 0x00 0x00000003  if (A == close) goto 0009
 #  0006: 0x15 0x02 0x00 0x00000020  if (A == dup) goto 0009
 #  0007: 0x15 0x01 0x00 0x0000003c  if (A == exit) goto 0009
-#  0008: 0x06 0x00 0x00 0x00050005  return ERRNO
+#  0008: 0x06 0x00 0x00 0x00050005  return ERRNO(5)
 #  0009: 0x06 0x00 0x00 0x7fff0000  return ALLOW
 #  0010: 0x06 0x00 0x00 0x00000000  return KILL
 
@@ -226,7 +227,7 @@ $ seccomp-tools emu spec/data/libseccomp.bpf 0x3
 #  0005: 0x15 0x03 0x00 0x00000003  if (A == close) goto 0009
 #  0006: 0x15 0x02 0x00 0x00000020  if (A == dup) goto 0009
 #  0007: 0x15 0x01 0x00 0x0000003c  if (A == exit) goto 0009
-#  0008: 0x06 0x00 0x00 0x00050005  return ERRNO
+#  0008: 0x06 0x00 0x00 0x00050005  return ERRNO(5)
 #  0009: 0x06 0x00 0x00 0x7fff0000  return ALLOW
 #  0010: 0x06 0x00 0x00 0x00000000  return KILL
 #

data/lib/seccomp-tools.rb

@@ -4,5 +4,8 @@
 module SeccompTools
 end
 
+require 'seccomp-tools/asm/asm'
+require 'seccomp-tools/disasm/disasm'
 require 'seccomp-tools/dumper'
+require 'seccomp-tools/emulator'
 require 'seccomp-tools/version'

data/lib/seccomp-tools/asm/compiler.rb

@@ -30,7 +30,8 @@ module SeccompTools
                 when /^#{Tokenizer::LABEL_REGEXP}:/ then define_label
                 when /^return/ then ret
                 when /^(A|X)\s*=[^=]/ then assign
-                when /^A\s*.=/ then alu
+                when /^mem\[\d+\]\s*=\s*(A|X)/ then store
+                when /^A\s*.{1,2}=/ then alu
                 end
         rescue ArgumentError => e
           invalid(@input.size - 1, e.message)
@@ -80,12 +81,14 @@ module SeccompTools
       # <A|X> = 123|sys_const
       # A = args[i]|sys_number|arch
       # A = data[4 * i]
+      # mem[i] = <A|X>
       def compile_assign(dst, src)
         # misc txa / tax
         return emit(:misc, :txa) if dst == :a && src == :x
         return emit(:misc, :tax) if dst == :x && src == :a
         src = evaluate(src)
-        # TODO: handle store case.
+        # case of st / stx
+        return emit(src == :x ? :stx : :st, k: dst.last) if dst[0] == :mem
         ld = dst == :x ? :ldx : :ld
         # <A|X> = <immi>
         return emit(ld, :imm, k: src) if src.is_a?(Integer)
@@ -104,7 +107,11 @@ module SeccompTools
       end
 
       def compile_ret(val)
-        emit(:ret, k: val)
+        if val == :a
+          src = :a
+          val = 0
+        end
+        emit(:ret, src, k: val)
       end
 
       def compile_cmp(op, val, jt, jf)
@@ -124,7 +131,7 @@ module SeccompTools
       end
 
       def evaluate(val)
-        return val if val.is_a?(Integer) || val == :x
+        return val if val.is_a?(Integer) || val == :x || val == :a
         # keywords
         val = case val
               when 'sys_number' then [:data, 0]
@@ -186,10 +193,16 @@ module SeccompTools
               token.fetch(:sys_num_x) ||
               token.fetch(:ary) ||
               token.fetch('sys_number') ||
-              token.fetch('arch')
+              token.fetch('arch') ||
+              raise(ArgumentError, 'Invalid source: ' + token.cur.inspect)
         [:assign, dst, src]
       end
 
+      # returns same format as assign
+      def store
+        [:assign, token.fetch!(:ary), token.fetch!('=') && token.fetch!(:ax)]
+      end
+
       def define_label
         name = token.fetch!(:goto)
         token.fetch(':')
@@ -197,6 +210,7 @@ module SeccompTools
       end
 
       # A op= sys_num_x
+      # TODO: support A = -A
       def alu
         token.fetch!('A')
         op = token.fetch!(:alu_op)

data/lib/seccomp-tools/asm/tokenizer.rb

@@ -121,7 +121,7 @@ Invalid return type: #{cur.inspect}.
 
       def fetch_ary
         support_name = %w[data mem args]
-        regexp = /(#{support_name.join('|')})\[[0-9]{1,2}\]/
+        regexp = /(#{support_name.join('|')})\[[0-9]{1,9}\]/
         match = fetch_regexp(regexp)
         return nil if match.nil?
         res, val = match.split('[')

data/lib/seccomp-tools/cli/cli.rb

@@ -9,9 +9,9 @@ module SeccompTools
   module CLI
     # Handled commands
     COMMANDS = {
-      'dump' => SeccompTools::CLI::Dump,
-      'disasm' => SeccompTools::CLI::Disasm,
       'asm' => SeccompTools::CLI::Asm,
+      'disasm' => SeccompTools::CLI::Disasm,
+      'dump' => SeccompTools::CLI::Dump,
       'emu' => SeccompTools::CLI::Emu
     }.freeze
 
@@ -23,7 +23,7 @@ List of commands:
 
 %COMMANDS
 
-See 'seccomp-tools --help <command>' to read about a specific subcommand.
+See 'seccomp-tools <command> --help' to read about a specific subcommand.
 EOS
 
     module_function

data/lib/seccomp-tools/cli/dump.rb

@@ -23,7 +23,8 @@ module SeccompTools
         @parser ||= OptionParser.new do |opt|
           opt.banner = usage
           opt.on('-c', '--sh-exec <command>', 'Executes the given command (via sh).',
-                 'Use this option if want to pass arguments or do pipe things to the execution file.') do |command|
+                 'Use this option if want to pass arguments or do pipe things to the execution file.',
+                 'e.g. use `-c "./bin > /dev/null"` to dump seccomp without being mixed with stdout.') do |command|
             option[:command] = command
           end
 

data/lib/seccomp-tools/instruction/ret.rb

@@ -6,8 +6,7 @@ module SeccompTools
     class RET < Base
       # Decompile instruction.
       def decompile
-        _, type = symbolize
-        "return #{type == :a ? 'A' : ACTION.invert[type & 0x7fff0000]}"
+        "return #{ret_str}"
       end
 
       # See {Instruction::Base#symbolize}.
@@ -22,6 +21,16 @@ module SeccompTools
       def branch(*)
         []
       end
+
+      private
+
+      def ret_str
+        _, type = symbolize
+        return 'A' if type == :a
+        str = ACTION.invert[type & 0x7fff0000].to_s
+        str += "(#{type & 0xffff})" if str == 'ERRNO'
+        str
+      end
     end
   end
 end

data/lib/seccomp-tools/instruction/st.rb

@@ -10,7 +10,7 @@ module SeccompTools
       end
 
       # See {Instruction::Base#symbolize}.
-      # @return [[:misc, (:a, :x), Integer]]
+      # @return [[:st, (:a, :x), Integer]]
       def symbolize
         [:st, reg.downcase.to_sym, k]
       end

data/lib/seccomp-tools/version.rb

@@ -1,4 +1,4 @@
 module SeccompTools
   # Gem version.
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seccomp-tools
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - david942j
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: seccomp-tools