From 8505b9586e70def75ee089299d6574db62a57b11 Mon Sep 17 00:00:00 2001 From: Mauro Ezequiel Moltrasio Date: Thu, 1 Aug 2024 16:08:28 +0200 Subject: [PATCH 1/3] Update Falco to v2.11 Upstream version base is tag 0.17.2. --- collector/lib/system-inspector/EventExtractor.h | 4 ++-- falcosecurity-libs | 2 +- kernel-modules/MODULE_VERSION | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/collector/lib/system-inspector/EventExtractor.h b/collector/lib/system-inspector/EventExtractor.h index 8e3557cdfa..5fe8e20c5c 100644 --- a/collector/lib/system-inspector/EventExtractor.h +++ b/collector/lib/system-inspector/EventExtractor.h @@ -43,7 +43,7 @@ class EventExtractor { public: \ const type* get_##id(sinsp_evt* event) { \ uint32_t len; \ - auto buf = filter_check_##id##_->extract(event, &len); \ + auto buf = filter_check_##id##_->extract_single(event, &len); \ if (!buf) return nullptr; \ if (len != sizeof(type)) { \ CLOG_THROTTLED(WARNING, std::chrono::seconds(30)) \ @@ -61,7 +61,7 @@ class EventExtractor { public: \ const char* get_##id(sinsp_evt* event) { \ uint32_t len; \ - auto buf = filter_check_##id##_->extract(event, &len); \ + auto buf = filter_check_##id##_->extract_single(event, &len); \ if (!buf) return nullptr; \ return reinterpret_cast(buf); \ } \ diff --git a/falcosecurity-libs b/falcosecurity-libs index a283653ee8..95b070dcb1 160000 --- a/falcosecurity-libs +++ b/falcosecurity-libs @@ -1 +1 @@ -Subproject commit a283653ee897a17c77d781931170962494188bc3 +Subproject commit 95b070dcb1111ba4b80fc154b55a02ed52c1d17f diff --git a/kernel-modules/MODULE_VERSION b/kernel-modules/MODULE_VERSION index 10c2c0c3d6..46b81d815a 100644 --- a/kernel-modules/MODULE_VERSION +++ b/kernel-modules/MODULE_VERSION @@ -1 +1 @@ -2.10.0 +2.11.0 From b07c463db9bffedc7783e90708a1201b544d5826 Mon Sep 17 00:00:00 2001 From: Mauro Ezequiel Moltrasio Date: Thu, 1 Aug 2024 16:35:16 +0200 Subject: [PATCH 2/3] Formatting fixes --- .../lib/system-inspector/EventExtractor.h | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/collector/lib/system-inspector/EventExtractor.h b/collector/lib/system-inspector/EventExtractor.h index 5fe8e20c5c..e88d25a4c0 100644 --- a/collector/lib/system-inspector/EventExtractor.h +++ b/collector/lib/system-inspector/EventExtractor.h @@ -43,7 +43,7 @@ class EventExtractor { public: \ const type* get_##id(sinsp_evt* event) { \ uint32_t len; \ - auto buf = filter_check_##id##_->extract_single(event, &len); \ + auto buf = filter_check_##id##_->extract_single(event, &len); \ if (!buf) return nullptr; \ if (len != sizeof(type)) { \ CLOG_THROTTLED(WARNING, std::chrono::seconds(30)) \ @@ -57,16 +57,16 @@ class EventExtractor { private: \ DECLARE_FILTER_CHECK(id, fieldname) -#define FIELD_CSTR(id, fieldname) \ - public: \ - const char* get_##id(sinsp_evt* event) { \ - uint32_t len; \ +#define FIELD_CSTR(id, fieldname) \ + public: \ + const char* get_##id(sinsp_evt* event) { \ + uint32_t len; \ auto buf = filter_check_##id##_->extract_single(event, &len); \ - if (!buf) return nullptr; \ - return reinterpret_cast(buf); \ - } \ - \ - private: \ + if (!buf) return nullptr; \ + return reinterpret_cast(buf); \ + } \ + \ + private: \ DECLARE_FILTER_CHECK(id, fieldname) #define EVT_ARG(name) FIELD_CSTR(evt_arg_##name, "evt.arg." #name) From 6292a24aee93db98ef11ba48a1716dbbfb3c4e13 Mon Sep 17 00:00:00 2001 From: Mauro Ezequiel Moltrasio Date: Fri, 2 Aug 2024 11:14:57 +0200 Subject: [PATCH 3/3] Update falco submodule and add -rc1 to module version --- falcosecurity-libs | 2 +- kernel-modules/MODULE_VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/falcosecurity-libs b/falcosecurity-libs index 95b070dcb1..ac58d274ec 160000 --- a/falcosecurity-libs +++ b/falcosecurity-libs @@ -1 +1 @@ -Subproject commit 95b070dcb1111ba4b80fc154b55a02ed52c1d17f +Subproject commit ac58d274ecf9a8e0278fd4f4b2e065b4c494f085 diff --git a/kernel-modules/MODULE_VERSION b/kernel-modules/MODULE_VERSION index 46b81d815a..89c6f25a17 100644 --- a/kernel-modules/MODULE_VERSION +++ b/kernel-modules/MODULE_VERSION @@ -1 +1 @@ -2.11.0 +2.11.0-rc1