Avoid reading unused lvars in Primitive.cexpr

Previously on builds with optimizations disabled, this could result in
an out of bounds read. When we had all of:
* built with -O0
* Leaf builtin
* Primitive.mandatory_only
* "no args builtin", called by vm_call_single_noarg_inline_builti
* The stack is escaped to the heap via binding or a proc

This is because mk_builtin_loader generated reads for all locals
regardless of whether they were used and in the case we generated a
mandatory_only iseq that would include more variables than were actually
available.

On optimized builds, the invalid accesses would be optimized away, and
this also was often unnoticed as the invalid access would just hit
another part of the stack unless it had been escaped to the heap.

The fix here is imperfect, as this could have false positives, but since
Primitive.cexpr! is only available within the cruby codebase itself
that's probably fine as a proper fix would be much more challenging (the
only false positives we found were in rjit.rb).

Fixes [Bug #20178]

Co-authored-by: Adam Hess <HParker@github.com>
This commit is contained in:
John Hawthorn 2024-01-11 11:57:03 -08:00
Родитель 371256775f
Коммит 18573b8d05
2 изменённых файлов: 15 добавлений и 0 удалений

Просмотреть файл

@ -1190,3 +1190,12 @@ assert_equal 'DC', %q{
test2 o1, [], block
$result.join
}
assert_equal 'ok', %q{
def foo
binding
["ok"].first
end
foo
foo
}, '[Bug #20178]'

Просмотреть файл

@ -263,11 +263,17 @@ end
def generate_cexpr(ofile, lineno, line_file, body_lineno, text, locals, func_name)
f = StringIO.new
# Avoid generating fetches of lvars we don't need. This is imperfect as it
# will match text inside strings or other false positives.
local_candidates = text.scan(/[a-zA-Z_][a-zA-Z0-9_]*/)
f.puts '{'
lineno += 1
# locals is nil outside methods
locals&.reverse_each&.with_index{|param, i|
next unless Symbol === param
next unless local_candidates.include?(param.to_s)
f.puts "MAYBE_UNUSED(const VALUE) #{param} = rb_vm_lvar(ec, #{-3 - i});"
lineno += 1
}