Skip to content

Commit a8d69fc

Browse files
terror96poiana
authored andcommitted
cleanup(libsinsp): removed unused PPME_SYSCALL_MKDIR_X statements
The current implementation does no longer emit PPME_SYSCALL_MKDIR_X events and these events are also converted to PPME_SYSCALL_MKDIR_2_X events for older scap files. Remove unused PPME_SYSCALL_MKDIR_X statements from the codebase. Added the CIF_FALLBACK_TO_EMPTY flag for parameters copied from the enter event. Signed-off-by: Tero Kauppinen <[email protected]>
1 parent c1cd8e2 commit a8d69fc

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

test/libscap/test_suites/engines/savefile/converter.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3937,23 +3937,26 @@ TEST_F(convert_event_test, PPME_SYSCALL_MKDIR_2_E_store) {
39373937
assert_event_storage_presence(evt);
39383938
}
39393939

3940-
TEST_F(convert_event_test, PPME_SYSCALL_MKDIR_2_X_to_3_params_no_enter) {
3940+
TEST_F(convert_event_test, PPME_SYSCALL_MKDIR_2_X_2_to_3_params_no_enter) {
39413941
constexpr uint64_t ts = 12;
39423942
constexpr int64_t tid = 25;
39433943

39443944
constexpr int64_t res = 89;
39453945
constexpr char path[] = "/hello";
39463946

3947-
// Defaulted to 0
3948-
constexpr uint32_t mode = 0;
3947+
// Set to empty values
3948+
constexpr auto mode = empty_value<uint32_t>();
3949+
3950+
const std::set<uint32_t> expected_empty_param_indexes{2};
39493951

39503952
assert_single_conversion_success(
39513953
CONVERSION_COMPLETED,
39523954
create_safe_scap_event(ts, tid, PPME_SYSCALL_MKDIR_2_X, 2, res, path),
3953-
create_safe_scap_event(ts, tid, PPME_SYSCALL_MKDIR_2_X, 3, res, path, mode));
3955+
create_safe_scap_event(ts, tid, PPME_SYSCALL_MKDIR_2_X, 3, res, path, mode),
3956+
expected_empty_param_indexes);
39543957
}
39553958

3956-
TEST_F(convert_event_test, PPME_SYSCALL_MKDIR_2_X_to_3_params_with_enter) {
3959+
TEST_F(convert_event_test, PPME_SYSCALL_MKDIR_2_X_2_to_3_params_with_enter) {
39573960
constexpr uint64_t ts = 12;
39583961
constexpr int64_t tid = 25;
39593962

@@ -3972,7 +3975,7 @@ TEST_F(convert_event_test, PPME_SYSCALL_MKDIR_2_X_to_3_params_with_enter) {
39723975
create_safe_scap_event(ts, tid, PPME_SYSCALL_MKDIR_2_X, 3, res, path, mode));
39733976
}
39743977

3975-
TEST_F(convert_event_test, PPME_SYSCALL_MKDIR_to_MKDIR_2_with_enter) {
3978+
TEST_F(convert_event_test, PPME_SYSCALL_MKDIR_X_1_to_2_X_3_with_enter) {
39763979
constexpr uint64_t ts = 12;
39773980
constexpr int64_t tid = 25;
39783981

userspace/libscap/engine/savefile/converter/table.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,15 +300,17 @@ const std::unordered_map<conversion_key, conversion_info> g_conversion_table = {
300300
/*====================== MKDIR ======================*/
301301
{conversion_key{PPME_SYSCALL_MKDIR_2_E, 1}, conversion_info().action(C_ACTION_STORE)},
302302
{conversion_key{PPME_SYSCALL_MKDIR_2_X, 2},
303-
conversion_info().action(C_ACTION_ADD_PARAMS).instrs({{C_INSTR_FROM_ENTER, 0}})},
303+
conversion_info()
304+
.action(C_ACTION_ADD_PARAMS)
305+
.instrs({{C_INSTR_FROM_ENTER, 0, CIF_FALLBACK_TO_EMPTY}})},
304306
{conversion_key{PPME_SYSCALL_MKDIR_E, 2}, conversion_info().action(C_ACTION_STORE)},
305307
{conversion_key{PPME_SYSCALL_MKDIR_X, 1},
306308
conversion_info()
307309
.desired_type(PPME_SYSCALL_MKDIR_2_X)
308310
.action(C_ACTION_CHANGE_TYPE)
309311
.instrs({{C_INSTR_FROM_OLD, 0},
310-
{C_INSTR_FROM_ENTER, 0},
311-
{C_INSTR_FROM_ENTER, 1}})},
312+
{C_INSTR_FROM_ENTER, 0, CIF_FALLBACK_TO_EMPTY},
313+
{C_INSTR_FROM_ENTER, 1, CIF_FALLBACK_TO_EMPTY}})},
312314
/*====================== UNSHARE ======================*/
313315
{conversion_key{PPME_SYSCALL_UNSHARE_E, 1}, conversion_info().action(C_ACTION_STORE)},
314316
{conversion_key{PPME_SYSCALL_UNSHARE_X, 1},

userspace/libsinsp/event.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1700,7 +1700,6 @@ void sinsp_evt::save_enter_event_params(sinsp_evt *enter_evt) {
17001700

17011701
std::vector<const char *> *pnames = NULL;
17021702
switch(get_type()) {
1703-
case PPME_SYSCALL_MKDIR_X:
17041703
case PPME_SYSCALL_RMDIR_X:
17051704
case PPME_SYSCALL_UNLINK_X:
17061705
pnames = &path_param;

userspace/libsinsp/sinsp_filtercheck_fspath.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,6 @@ void sinsp_filter_check_fspath::create_fspath_checks() {
153153
std::shared_ptr<sinsp_filter_check> evt_arg_dev = create_event_check("evt.rawarg.dev");
154154
std::shared_ptr<sinsp_filter_check> evt_arg_dir = create_event_check("evt.rawarg.dir");
155155

156-
m_success_checks->emplace(PPME_SYSCALL_MKDIR_X, evt_arg_res_eq_0);
157-
158156
m_path_checks->emplace(PPME_SYSCALL_MKDIR_2_X, evt_arg_path);
159157
m_success_checks->emplace(PPME_SYSCALL_MKDIR_2_X, evt_arg_res_eq_0);
160158

@@ -319,7 +317,6 @@ uint8_t* sinsp_filter_check_fspath::extract_single(sinsp_evt* evt,
319317

320318
// For some event types we need to get the values from the enter event instead.
321319
switch(evt->get_type()) {
322-
case PPME_SYSCALL_MKDIR_X:
323320
case PPME_SYSCALL_RMDIR_X:
324321
case PPME_SYSCALL_UNLINK_X:
325322
enter_param = evt->get_enter_evt_param("path");

0 commit comments

Comments
 (0)