fix: some issues with Clang 18

Signed-off-by: Federico Aponte <[email protected]>
falcosecurity · Dec 13, 2024 · 0fae847 · 0fae847
1 parent 34cbe7e
commit 0fae847
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -1,44 +1,46 @@
 {
 	"version": 3,
 	"configurePresets": [
+		{
+			"name": "base",
+			"hidden": true,
+			"generator": "Unix Makefiles",
+			"cacheVariables": {
+				"CMAKE_BUILD_TYPE": "Release",
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
+				"BUILD_DRIVER": "ON",
+				"BUILD_BPF": "ON",
+				"BUILD_WARNINGS_AS_ERRORS": "ON"
+			}
+		},
 		{
 			"name": "scap-drivers",
+			"inherits": "base",
 			"displayName": "Build scap drivers and their tests",
 			"description": "Build all scap drivers (modern eBPF, legacy eBPF, kmod) and their tests",
-			"generator": "Unix Makefiles",
 			"binaryDir": "${sourceDir}/build-scap-drivers",
 			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "Release",
-				"BUILD_BPF": "ON",
-				"BUILD_DRIVER": "ON",
 				"USE_BUNDLED_DEPS": "ON",
 				"ENABLE_DRIVERS_TESTS": "ON",
 				"MODERN_BPF_DEBUG_MODE": "ON",
 				"BUILD_LIBSCAP_MODERN_BPF": "ON",
 				"BUILD_LIBSCAP_GVISOR": "OFF",
 				"CREATE_TEST_TARGETS": "ON",
 				"ENABLE_LIBSCAP_TESTS": "ON",
-				"SCAP_FILES_SUITE_ENABLE": "OFF",
-				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
-				"BUILD_WARNINGS_AS_ERRORS": "ON"
+				"SCAP_FILES_SUITE_ENABLE": "OFF"
 			}
 		},
 		{
 			"name": "sinsp-minimal",
+			"inherits": "base",
 			"displayName": "Build sinsp in minimal build",
 			"description": "Build sinsp in minimal build with its tests",
-			"generator": "Unix Makefiles",
 			"binaryDir": "${sourceDir}/build-sinsp-minimal",
 			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "Release",
-				"BUILD_DRIVER": "ON",
-				"BUILD_BPF": "ON",
 				"USE_BUNDLED_DEPS": "ON",
 				"CREATE_TEST_TARGETS": "ON",
 				"MINIMAL_BUILD": "ON",
-				"SCAP_FILES_SUITE_ENABLE": "OFF",
-				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
-				"BUILD_WARNINGS_AS_ERRORS": "ON"
+				"SCAP_FILES_SUITE_ENABLE": "OFF"
 			}
 		}
 	]

diff --git a/test/drivers/test_suites/syscall_exit_suite/getcwd_x.cpp b/test/drivers/test_suites/syscall_exit_suite/getcwd_x.cpp
@@ -8,7 +8,7 @@ TEST(SyscallExit, getcwdX_success) {
 
 	/*=============================== TRIGGER SYSCALL ===========================*/
 
-	unsigned long size = 200;
+	const unsigned long size = 200;
 	char path[size];
 	uint32_t read_bytes = syscall(__NR_getcwd, path, size);
 	assert_syscall_state(SYSCALL_SUCCESS, "getcwd", read_bytes, NOT_EQUAL, -1);
@@ -49,7 +49,7 @@ TEST(SyscallExit, getcwdX_fail) {
 
 	/*=============================== TRIGGER SYSCALL ===========================*/
 
-	long size = 2;
+	const long size = 2;
 	char path[size];
 	assert_syscall_state(SYSCALL_FAILURE, "getcwd", syscall(__NR_getcwd, path, size));
 	int64_t errno_value = -errno;

diff --git a/test/drivers/test_suites/syscall_exit_suite/readv_x.cpp b/test/drivers/test_suites/syscall_exit_suite/readv_x.cpp
@@ -64,7 +64,7 @@ TEST(SyscallExit, readvX_success) {
 	          strlen(test_string) + 1);
 
 	/* Try to read the string with readv using three buffers */
-	int32_t iovcnt = 3;
+	const int32_t iovcnt = 3;
 	iovec iov[iovcnt];
 	size_t buf_size = 15;
 	ASSERT_GT(iovcnt * buf_size, strlen(test_string) + 1);

diff --git a/userspace/libscap/linux/scap_cgroup.c b/userspace/libscap/linux/scap_cgroup.c
@@ -746,7 +746,7 @@ static int32_t scap_cgroup_resolve_v2(struct scap_cgroup_interface* cgi,
 		return SCAP_FAILURE;
 	}
 
-	struct scap_cgroup_set found_subsystems = {.len = 0, {'\0'}};
+	struct scap_cgroup_set found_subsystems = {.len = 0, .path = {'\0'}};
 	while(1)  // not reached cgroup mountpoint yet
 	{
 		struct scap_cgroup_set current_subsystems;

diff --git a/userspace/libsinsp/filter_check_list.cpp b/userspace/libsinsp/filter_check_list.cpp
@@ -31,6 +31,8 @@ using namespace std;
 // sinsp_filter_check_list implementation
 ///////////////////////////////////////////////////////////////////////////////
 
+filter_check_list::~filter_check_list() = default;
+
 void filter_check_list::add_filter_check(std::unique_ptr<sinsp_filter_check> filter_check) {
 	// If a filtercheck already exists with this name and
 	// shortdesc, don't add it--this can occur when plugins are

diff --git a/userspace/libsinsp/filter_check_list.h b/userspace/libsinsp/filter_check_list.h
@@ -33,7 +33,7 @@ class sinsp;
 class filter_check_list {
 public:
 	filter_check_list() = default;
-	virtual ~filter_check_list() = default;
+	virtual ~filter_check_list();
 
 	void add_filter_check(std::unique_ptr<sinsp_filter_check> filter_check);
 	void get_all_fields(std::vector<const filter_check_info*>&) const;