Skip to content

Commit

Permalink
Raise an error on jump distance > 255 (#245)
Browse files Browse the repository at this point in the history
Fixes #244
  • Loading branch information
david942j committed Sep 19, 2023
1 parent 0932622 commit 2a50919
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 7 deletions.
21 changes: 14 additions & 7 deletions lib/seccomp-tools/asm/compiler.rb
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ def resolve_symbols(statements)
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)
Expand All @@ -86,18 +89,22 @@ def resolve_symbol(index, sym)

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
return str.to_i if str == str.to_i.to_s && str.to_i <= JUMP_DISTANCE_MAX

raise SeccompTools::UndefinedLabelError,
@scanner.format_error(sym, "Cannot find label '#{str}'")
end
if @symbols[str][1] <= index
raise SeccompTools::BackwardJumpError,
@scanner.format_error(sym,
"Does not support backward jumping to '#{str}'")
end

@symbols[str][1] - index - 1
(@symbols[str][1] - index - 1).tap do |dis|
if dis.negative?
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

# Emits a raw BPF object.
Expand Down
4 changes: 4 additions & 0 deletions lib/seccomp-tools/error.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,8 @@ class BackwardJumpError < Error
# Raised when a label is defined more than once on compiling seccomp assembly.
class DuplicateLabelError < Error
end

# Raised when a jump is longer than supported distance.
class LongJumpError < Error
end
end
15 changes: 15 additions & 0 deletions spec/asm/compiler_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -224,5 +224,20 @@
^^^^^
EOS
end

it 'raises on long jump' do
compiler = described_class.new(<<-EOS, nil, :amd64)
A = args[0]
A == 0 ? next : end
#{"A = 0\n" * 260}
end: return ALLOW
EOS

expect { compiler.compile! }.to raise_error(SeccompTools::LongJumpError, <<-EOS)
<inline>:2:24 Does not support jumping farther than 255, got: 260
A == 0 ? next : end
^^^
EOS
end
end
end

0 comments on commit 2a50919

Please sign in to comment.