seccomp-tools 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 898cc2a23df6443f39054c4b9027a576fb929729f74fc804ae82ae3b11c6772e
-  data.tar.gz: 0e07d2d1914ac7185135425d0e34f0dcb1b6100e977176d8bd9ce23f95a3f287
+  metadata.gz: dc7a6ded95dadf7826ae07868793839e0ffa417ed936ae8461ff5bb6b59ff135
+  data.tar.gz: 82a0f811819137309ea22d68fe21fec5d48aad7b96f142b981c57478146a47af
 SHA512:
-  metadata.gz: ec604fca33e16dd6ca77e923e34629338245828abdf3c97e9974d205a2306aa9ae0f3bc074b90e056790a8de86ed6484ab17ce190524b30394f2fda2b5dd9432
-  data.tar.gz: 399e5e77fa99de23f3ad5013c442fc29a800a261d04150ab0bd467744a9302601ca7c60e5570e4e65f423cf4c93e4eb4428ae3f33b97d6a64c223af13b342e47
+  metadata.gz: 4d630e759687a7641d8cdeb4012a433a4fedc67c2f3e322c4cfaf041428e1199a2c46dd5db50c36a00a79a5b203f648f90345ac4ad6654b0cba93344c6737158
+  data.tar.gz: 23a441eb5cf55d3eb18a91a20e4b23a242e7b9b381dab81457ab3b087d9c53847e2d47be161c11305f213e629a23403b806e1a8e31e89adbd90443d1f79ef301

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

@@ -71,14 +71,11 @@ module SeccompTools
 
           jt = resolve_symbol(idx, statement.data[1])
           jf = resolve_symbol(idx, statement.data[2])
-          statement.data[1] = jt
-          statement.data[2] = jf
+          statement.data[1] = [jt, statement.data[1]]
+          statement.data[2] = [jf, statement.data[2]]
         end
       end
 
-      # The farthest distance of a relative jump in BPF.
-      JUMP_DISTANCE_MAX = 255
-
       # @param [Integer] index
       # @param [SeccompTools::Asm::Token, :next] sym
       def resolve_symbol(index, sym)
@@ -89,7 +86,7 @@ module SeccompTools
 
         if @symbols[str].nil?
           # special case - goto <n> can be considered as $+1+<n>
-          return str.to_i if str == str.to_i.to_s && str.to_i <= JUMP_DISTANCE_MAX
+          return str.to_i if str == str.to_i.to_s
 
           raise SeccompTools::UndefinedLabelError,
                 @scanner.format_error(sym, "Cannot find label '#{str}'")
@@ -100,10 +97,6 @@ module SeccompTools
             raise SeccompTools::BackwardJumpError,
                   @scanner.format_error(sym, "Does not support backward jumping to '#{str}'")
           end
-          if dis > JUMP_DISTANCE_MAX
-            raise SeccompTools::LongJumpError,
-                  @scanner.format_error(sym, "Does not support jumping farther than #{JUMP_DISTANCE_MAX}, got: #{dis}")
-          end
         end
       end
 
@@ -176,10 +169,21 @@ module SeccompTools
         emit(:ret, src, k: val.to_i)
       end
 
-      def emit_cmp(cmp, jt, jf)
+      # The farthest distance of a relative jump in BPF.
+      JUMP_DISTANCE_MAX = 255
+
+      def emit_cmp(cmp, jt_sym, jf_sym)
+        jt = jt_sym[0]
+        jf = jf_sym[0]
         jop, jt, jf = convert_jmp_op(cmp, jt, jf)
-        return emit(:jmp, jop, 0, jt: 0, jf: 0, k: jt) if jop == :ja || jt == jf
+        return emit(:jmp, :none, 0, jt: 0, jf: 0, k: jt) if jop == :ja || jt == jf
 
+        [jt_sym, jf_sym].each do |dis, sym|
+          if dis > JUMP_DISTANCE_MAX
+            raise SeccompTools::LongJumpError,
+                  @scanner.format_error(sym, "Does not support jumping farther than #{JUMP_DISTANCE_MAX}, got: #{dis}")
+          end
+        end
         val = cmp[1]
         src = val.x? ? :x : :k
         k = val.x? ? 0 : val.to_i

data/lib/seccomp-tools/version.rb

@@ -2,5 +2,5 @@
 
 module SeccompTools
   # Gem version.
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seccomp-tools
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - david942j
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2023-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake