github/falco
1
0
Fork 0
mirror of https://github.com/falcosecurity/falco.git synced 2025-09-25 20:30:47 +00:00
Code Issues Projects Releases Wiki Activity

fix(build): various fixes for macos build

Browse Source 
Signed-off-by: Roberto Scolaro <roberto.scolaro21@gmail.com>
This commit is contained in:
Roberto Scolaro
2023-10-25 21:17:55 +02:00
committed by poiana
parent 8cfa79fbc8
commit e0f7c597be
4 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -109,7 +109,7 @@ endif()
# explicitly set hardening flags # explicitly set hardening flags
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(FALCO_SECURITY_FLAGS "") set(FALCO_SECURITY_FLAGS "")
if(NOT EMSCRIPTEN) if(NOT EMSCRIPTEN AND NOT APPLE)
set(FALCO_SECURITY_FLAGS "${FALCO_SECURITY_FLAGS} -Wl,-z,relro,-z,now -fstack-protector-strong") set(FALCO_SECURITY_FLAGS "${FALCO_SECURITY_FLAGS} -Wl,-z,relro,-z,now -fstack-protector-strong")
endif() endif()
if(CMAKE_BUILD_TYPE STREQUAL "release") if(CMAKE_BUILD_TYPE STREQUAL "release")

5
cmake/modules/falcosecurity-libs.cmake
View File

@@ -95,10 +95,11 @@ include(CheckSymbolExists)
check_symbol_exists(strlcpy "string.h" HAVE_STRLCPY) check_symbol_exists(strlcpy "string.h" HAVE_STRLCPY)
if(HAVE_STRLCPY) if(HAVE_STRLCPY)
message(STATUS "Existing strlcpy found, will *not* use local definition by setting -DHAVE_STRLCPY.") message(STATUS "Existing strlcpy and strlcat found, will *not* use local definition by setting -DHAVE_STRLCPY and -DHAVE_STRLCAT.")
add_definitions(-DHAVE_STRLCPY) add_definitions(-DHAVE_STRLCPY)
add_definitions(-DHAVE_STRLCAT)
else() else()
message(STATUS "No strlcpy found, will use local definition") message(STATUS "No strlcpy and strlcat found, will use local definition")
endif() endif()
include(driver) include(driver)

4
userspace/falco/app/restart_handler.cpp
View File

@@ -22,7 +22,9 @@ limitations under the License.
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#if !defined(__APPLE__)
#include <sys/inotify.h> #include <sys/inotify.h>
#endif
#include <sys/select.h> #include <sys/select.h>
#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 30 #if __GLIBC__ == 2 && __GLIBC_MINOR__ < 30
@@ -93,6 +95,7 @@ void falco::app::restart_handler::stop()
void falco::app::restart_handler::watcher_loop() noexcept void falco::app::restart_handler::watcher_loop() noexcept
{ {
#ifdef __linux__
if (fcntl(m_inotify_fd, F_SETOWN, gettid()) < 0) if (fcntl(m_inotify_fd, F_SETOWN, gettid()) < 0)
{ {
// an error occurred, we can't recover // an error occurred, we can't recover
@@ -207,4 +210,5 @@ void falco::app::restart_handler::watcher_loop() noexcept
// next timeout. // next timeout.
should_check = true; should_check = true;
} }
#endif
} }

15
userspace/falco/stats_writer.cpp
View File

@@ -33,7 +33,11 @@ limitations under the License.
// overflows here. Threads calling stats_writer::handle() will just // overflows here. Threads calling stats_writer::handle() will just
// check that this value changed since their last observation. // check that this value changed since their last observation.
static std::atomic<stats_writer::ticker_t> s_timer((stats_writer::ticker_t) 0); static std::atomic<stats_writer::ticker_t> s_timer((stats_writer::ticker_t) 0);
#if !defined(__APPLE__)
static timer_t s_timerid; static timer_t s_timerid;
#else
static uint16_t s_timerid;
#endif
// note: Workaround for older GLIBC versions (< 2.35), where calling timer_delete() // note: Workaround for older GLIBC versions (< 2.35), where calling timer_delete()
// with an invalid timer ID not returned by timer_create() causes a segfault because of // with an invalid timer ID not returned by timer_create() causes a segfault because of
// a bug in GLIBC (https://sourceware.org/bugzilla/show_bug.cgi?id=28257). // a bug in GLIBC (https://sourceware.org/bugzilla/show_bug.cgi?id=28257).
@@ -48,7 +52,9 @@ static void timer_handler(int signum)
bool stats_writer::init_ticker(uint32_t interval_msec, std::string &err) bool stats_writer::init_ticker(uint32_t interval_msec, std::string &err)
{ {
#if !defined(__APPLE__)
struct itimerspec timer = {}; struct itimerspec timer = {};
#endif
struct sigaction handler = {}; struct sigaction handler = {};
memset (&handler, 0, sizeof(handler)); memset (&handler, 0, sizeof(handler));
@@ -64,7 +70,7 @@ bool stats_writer::init_ticker(uint32_t interval_msec, std::string &err)
sev.sigev_notify = SIGEV_SIGNAL; sev.sigev_notify = SIGEV_SIGNAL;
sev.sigev_signo = SIGALRM; sev.sigev_signo = SIGALRM;
sev.sigev_value.sival_ptr = &s_timerid; sev.sigev_value.sival_ptr = &s_timerid;
#ifndef __EMSCRIPTEN__ #if !defined(__EMSCRIPTEN__) && !defined(__APPLE__)
// delete any previously set timer // delete any previously set timer
if (s_timerid_exists) if (s_timerid_exists)
{ {
@@ -84,11 +90,14 @@ bool stats_writer::init_ticker(uint32_t interval_msec, std::string &err)
s_timerid_exists = true; s_timerid_exists = true;
#endif #endif
#if !defined(__APPLE__)
timer.it_value.tv_sec = interval_msec / 1000; timer.it_value.tv_sec = interval_msec / 1000;
timer.it_value.tv_nsec = (interval_msec % 1000) * 1000 * 1000; timer.it_value.tv_nsec = (interval_msec % 1000) * 1000 * 1000;
timer.it_interval = timer.it_value; timer.it_interval = timer.it_value;
#endif
#ifndef __EMSCRIPTEN__ #if !defined(__EMSCRIPTEN__) && !defined(__APPLE__)
if (timer_settime(s_timerid, 0, &timer, NULL) == -1) if (timer_settime(s_timerid, 0, &timer, NULL) == -1)
{ {
err = std::string("Could not set up periodic timer: ") + strerror(errno); err = std::string("Could not set up periodic timer: ") + strerror(errno);
@@ -151,7 +160,7 @@ stats_writer::~stats_writer()
m_file_output.close(); m_file_output.close();
} }
// delete timerID and reset timer // delete timerID and reset timer
#ifndef __EMSCRIPTEN__ #if !defined(__EMSCRIPTEN__) && !defined(__APPLE__)
if (s_timerid_exists) if (s_timerid_exists)
{ {
timer_delete(s_timerid); timer_delete(s_timerid);