mirror of
https://github.com/scylladb/scylladb.git
synced 2026-05-12 19:02:12 +00:00
test/boost: add regression test for table_helper insert() UAF
Deterministic reproducer using an error injection point placed in table_helper::insert() between cache_table_info() and execute(). The test parks fiber A at the injection, drops the target table (evicting the prepared_statements_cache entry), runs fiber B which nulls _insert_stmt, then releases fiber A. Without the fix this crashes in execute(); with the fix fiber A holds a local strong ref and proceeds. Uses the new waiters() API to synchronize with fiber A's entry into the injection.
This commit is contained in:
@@ -1660,6 +1660,7 @@ deps['test/boost/combined_tests'] += [
|
||||
'test/boost/auth_cache_test.cc',
|
||||
'test/boost/auth_test.cc',
|
||||
'test/boost/batchlog_manager_test.cc',
|
||||
'test/boost/table_helper_test.cc',
|
||||
'test/boost/cache_algorithm_test.cc',
|
||||
'test/boost/castas_fcts_test.cc',
|
||||
'test/boost/cdc_test.cc',
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
#include "cql3/statements/property_definitions.hh"
|
||||
#include "utils/assert.hh"
|
||||
#include "utils/error_injection.hh"
|
||||
#include <seastar/core/coroutine.hh>
|
||||
#include <seastar/coroutine/parallel_for_each.hh>
|
||||
#include "table_helper.hh"
|
||||
@@ -158,6 +159,8 @@ future<> table_helper::insert(cql3::query_processor& qp, service::migration_mana
|
||||
auto stmt = _insert_stmt;
|
||||
auto opts = opt_maker();
|
||||
opts.prepare(_prepared_stmt->bound_names);
|
||||
co_await utils::get_local_injector().inject("table_helper_insert_before_execute",
|
||||
utils::wait_for_message(std::chrono::seconds{30}));
|
||||
co_await stmt->execute(qp, qs, opts, std::nullopt);
|
||||
}
|
||||
|
||||
|
||||
@@ -325,6 +325,7 @@ add_scylla_test(combined_tests
|
||||
auth_cache_test.cc
|
||||
auth_test.cc
|
||||
batchlog_manager_test.cc
|
||||
table_helper_test.cc
|
||||
cache_algorithm_test.cc
|
||||
castas_fcts_test.cc
|
||||
cdc_test.cc
|
||||
|
||||
101
test/boost/table_helper_test.cc
Normal file
101
test/boost/table_helper_test.cc
Normal file
@@ -0,0 +1,101 @@
|
||||
/*
|
||||
* Copyright (C) 2026-present ScyllaDB
|
||||
*/
|
||||
|
||||
/*
|
||||
* SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
|
||||
*/
|
||||
|
||||
#include <boost/test/unit_test.hpp>
|
||||
|
||||
#undef SEASTAR_TESTING_MAIN
|
||||
#include <seastar/testing/test_case.hh>
|
||||
#include <seastar/core/future-util.hh>
|
||||
#include <seastar/core/shared_ptr.hh>
|
||||
#include <vector>
|
||||
|
||||
#include "test/lib/cql_test_env.hh"
|
||||
#include "test/lib/log.hh"
|
||||
|
||||
#include "table_helper.hh"
|
||||
#include "cql3/query_processor.hh"
|
||||
#include "cql3/query_options.hh"
|
||||
#include "cql3/cql_config.hh"
|
||||
#include "service/client_state.hh"
|
||||
#include "service/migration_manager.hh"
|
||||
#include "service/query_state.hh"
|
||||
#include "types/types.hh"
|
||||
#include "utils/error_injection.hh"
|
||||
|
||||
// Regression test for use-after-free in table_helper::insert() when the
|
||||
// prepared_statements_cache entry is invalidated (e.g. DROP TABLE) while a
|
||||
// concurrent insert() is suspended in execute(). The injection point inside
|
||||
// insert() is used to park fiber A deterministically, then fiber B drops the
|
||||
// last strong ref; without the fix, resuming A crashes.
|
||||
|
||||
BOOST_AUTO_TEST_SUITE(table_helper_test)
|
||||
|
||||
#ifdef SCYLLA_ENABLE_ERROR_INJECTION
|
||||
|
||||
SEASTAR_TEST_CASE(test_concurrent_invalidation) {
|
||||
return do_with_cql_env_thread([] (cql_test_env& env) {
|
||||
auto& qp = env.local_qp();
|
||||
auto& mm = env.migration_manager().local();
|
||||
|
||||
env.execute_cql("CREATE KEYSPACE th_ks WITH replication = "
|
||||
"{'class': 'NetworkTopologyStrategy', 'replication_factor': 1}").get();
|
||||
env.execute_cql("CREATE TABLE th_ks.t (id int PRIMARY KEY, v int)").get();
|
||||
|
||||
const sstring create_cql = "CREATE TABLE IF NOT EXISTS th_ks.t (id int PRIMARY KEY, v int)";
|
||||
const sstring insert_cql = "INSERT INTO th_ks.t (id, v) VALUES (?, ?)";
|
||||
|
||||
table_helper helper("th_ks", "t", create_cql, insert_cql);
|
||||
|
||||
service::query_state qs(service::client_state::for_internal_calls(), empty_service_permit());
|
||||
|
||||
auto make_opts = [] {
|
||||
std::vector<cql3::raw_value> vals {
|
||||
cql3::raw_value::make_value(int32_type->decompose(0)),
|
||||
cql3::raw_value::make_value(int32_type->decompose(0)),
|
||||
};
|
||||
return cql3::query_options(cql3::default_cql_config, db::consistency_level::ONE,
|
||||
std::nullopt, std::move(vals), false,
|
||||
cql3::query_options::specific_options::DEFAULT);
|
||||
};
|
||||
|
||||
// Prime the prepared cache.
|
||||
helper.insert(qp, mm, qs, make_opts).get();
|
||||
|
||||
utils::get_local_injector().enable("table_helper_insert_before_execute", true /*one_shot*/);
|
||||
|
||||
// Fiber A: suspends at the injection, between cache_table_info() and execute().
|
||||
auto fiber_a = helper.insert(qp, mm, qs, make_opts);
|
||||
|
||||
// Wait until fiber A is actually parked in wait_for_message.
|
||||
while (utils::get_local_injector().waiters("table_helper_insert_before_execute") == 0) {
|
||||
seastar::yield().get();
|
||||
}
|
||||
|
||||
// Evict the prepared cache entry - drops its strong ref to the
|
||||
// modification_statement. helper._insert_stmt is the only ref left.
|
||||
env.execute_cql("DROP TABLE th_ks.t").discard_result().get();
|
||||
|
||||
// Fiber B: cache_table_info() sees the weak ref invalidated and sets
|
||||
// _insert_stmt = nullptr; the re-prepare then throws (table is gone).
|
||||
helper.insert(qp, mm, qs, make_opts)
|
||||
.handle_exception([] (std::exception_ptr) {}).get();
|
||||
|
||||
// Release fiber A. Unfixed: re-reads null _insert_stmt and crashes.
|
||||
utils::get_local_injector().receive_message("table_helper_insert_before_execute");
|
||||
|
||||
try {
|
||||
fiber_a.get();
|
||||
} catch (...) {
|
||||
// execute() may fail (table is gone); only the crash matters.
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
#endif // SCYLLA_ENABLE_ERROR_INJECTION
|
||||
|
||||
BOOST_AUTO_TEST_SUITE_END()
|
||||
Reference in New Issue
Block a user