new(CHANGELOG): add entry for 0.33.1

Signed-off-by: Luca Guerra <luca@guerra.sh>

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## v0.33.1
+
+Released on 2022-11-24
+
+### Minor Changes
+
+* update(falco): fix container-gvisor and kubernetes-gvisor print options [[#2288](https://github.com/falcosecurity/falco/pull/2288)]
+* Update libs to 0.9.2, fixing potential CLBO on gVisor+Kubernetes and crash with eBPF when some CPUs are offline [[#2299](https://github.com/falcosecurity/falco/pull/2299)] - [@LucaGuerra](https://github.com/LucaGuerra)
+
 ## v0.33.0
 
 Released on 2022-10-19

CMakeLists.txt

@@ -233,5 +233,3 @@ endif()
 
 # Packages configuration
 include(CPackConfig)
-
-add_subdirectory(docker/dev)

cmake/modules/falcosecurity-libs.cmake

@@ -27,8 +27,8 @@ else()
   # In case you want to test against another falcosecurity/libs version (or branch, or commit) just pass the variable -
   # ie., `cmake -DFALCOSECURITY_LIBS_VERSION=dev ..`
   if(NOT FALCOSECURITY_LIBS_VERSION)
-    set(FALCOSECURITY_LIBS_VERSION "0.9.0")
+    set(FALCOSECURITY_LIBS_VERSION "0.9.2")
-    set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=5319a1b6a72eba3d9524cf084be5fc2ed81e3e90b3bee8edbe58b8646af0cbcb")
+    set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=e1144595f0eb3b7fce31f92e124800aaf9aa31732551582f2ffd914f37f1a7c7")
   endif()
 
   # cd /path/to/build && cmake /path/to/source

docker/README.md

@@ -13,6 +13,5 @@ This directory contains various ways to package Falco as a container and related
 | [falcosecurity/falco-builder:latest](https://hub.docker.com/repository/docker/falcosecurity/falco-builder) | docker/builder | The complete build tool chain for compiling Falco from source. See [the documentation](https://falco.org/docs/getting-started/source/) for more details on building from source. Used to build Falco (CI). |
 | [falcosecurity/falco-tester:latest](https://hub.docker.com/repository/docker/falcosecurity/falco-tester) | docker/tester | Container image for running the Falco test suite. Used to run Falco integration tests (CI). |
 | _not to be published_ | docker/local | Built on-the-fly and used by falco-tester. |
-| _not to be published_ | docker/dev | Built on-the-fly to test local Falco development. |
 
-> Note: `falco-builder`, `falco-tester`, `docker/local`, `docker/dev` images are not integrated into the release process because they are development and CI tools that need to be manually pushed only when updated.
+> Note: `falco-builder`, `falco-tester` (and the `docker/local` image that it's built on the fly) are not integrated into the release process because they are development and CI tools that need to be manually pushed only when updated.

docker/dev/CMakeLists.txt

@@ -1,20 +0,0 @@
-# Build a docker container for local development
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  set(DEV_DOCKER_CXT ${CMAKE_BINARY_DIR}/docker/dev-docker-ctx)
-
-  # This target prepares the `tar.gz` artifact that will be passed to the dockerfile.
-  add_custom_target(dev-docker-prepare
-    COMMAND mkdir -p ${DEV_DOCKER_CXT}
-    COMMAND "${CMAKE_COMMAND}" --build . --target package
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/falco-${FALCO_VERSION}-${FALCO_TARGET_ARCH}.tar.gz ${DEV_DOCKER_CXT}/falco.tar.gz
-    DEPENDS falco
-  )
-
-  add_custom_target(dev-docker
-    COMMAND docker build
-      --tag falco-nodriver-dev
-      -f ${CMAKE_SOURCE_DIR}/docker/dev/nodriver.Dockerfile
-      ${DEV_DOCKER_CXT}
-    DEPENDS dev-docker-prepare
-  )
-endif()

docker/dev/README.md

@@ -1,59 +0,0 @@
-# Falco development image
-
-This docker image can be easily generated starting from a clean Falco build.
-
-## 1. Clone the Falco repo ⬇️
-
-```bash
-git clone https://github.com/falcosecurity/falco.git
-```
-
-## 2. Prepare the build directory 🏗️
-
-### `falco-runner-image` tag
-
-The CMake command that we will see in the next section builds Falco locally on your machine, and push it into a docker image, so as you may imagine the final image that will run Falco must have a similar `GLIBC` version to your local one. For this reason, you have to use docker tags.
-
-The `nodriver.Dockerfile` will use the `falco-runner-image` tag to build the final image as you can see here:
-
-```dockerfile
-FROM falco-runner-image AS runner
-
-...
-```
-
-For example, if I build Falco locally on a un `ubuntu:22-04` machine I will instruct docker to use `ubuntu:22-04` as a final running image.
-
-```bash
-docker tag ubuntu:22.04 falco-runner-image
-```
-
-In this way the `nodriver.Dockerfile` will use `ubuntu:22-04` during the building phase.
-
-### Cmake command
-
-Now that we set the `falco-runner-image` tag, we are ready to build our Falco image. Starting from the project root:
-
-```bash
-mkdir build && cd build
-cmake -DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DCPACK_GENERATOR=TGZ -DFALCO_ETC_DIR=/etc/falco ..
-make dev-docker
-```
-> __Please note__: These cmake options `-DUSE_BUNDLED_DEPS=On -DCREATE_TEST_TARGETS=Off -DCPACK_GENERATOR=TGZ -DFALCO_ETC_DIR=/etc/falco` are the required ones but you can provide additional options to build the image according to your needs (for example you can pass `-DMINIMAL_BUILD=On` if you want a minimal build image or `-DBUILD_FALCO_MODERN_BPF=ON` if you want to include the modern bpf probe inside the image)
-
-## 3. Run the docker image locally 🏎️
-
-```bash
-docker run --rm -i -t \
-           --privileged \
-           -v /var/run/docker.sock:/host/var/run/docker.sock \
-           -v /dev:/host/dev \
-           -v /proc:/host/proc:ro \
-           falco-nodriver-dev
-```
-
-If you change something in the Falco source code you can simply rebuild the image with:
-
-```bash
-make dev-docker
-```

docker/dev/nodriver.Dockerfile

@@ -1,33 +0,0 @@
-FROM ubuntu:22.04 AS builder
-
-COPY ./falco.tar.gz /
-
-WORKDIR /
-
-# 1. We remove the Falco directory with the name related to the version and the arch
-# 2. We remove the source folder
-# 3. We remove the `falco-driver-loader` binary
-RUN mkdir falco; \
-    tar -xzf falco.tar.gz -C falco --strip-component 1; \
-    rm -rf /falco/usr/src; \
-    rm /falco/usr/bin/falco-driver-loader
-
-# the time displayed in log messages and output messages will be in ISO 8601.
-RUN sed -e 's/time_format_iso_8601: false/time_format_iso_8601: true/' < /falco/etc/falco/falco.yaml > /falco/etc/falco/falco.yaml.new; \
-    mv /falco/etc/falco/falco.yaml.new /falco/etc/falco/falco.yaml
-
-# Please note: it could be necessary to change this base image according
-# to the `glibc` version of the machine where you build the tar.gz package
-# use `docker tag ubuntu:22.04 falco-runner-image` for example
-FROM falco-runner-image AS runner
-
-LABEL name="falcosecurity/falco-nodriver-dev"
-LABEL maintainer="cncf-falco-dev@lists.cncf.io"
-LABEL usage="docker run -it --rm --privileged -v /var/run/docker.sock:/host/var/run/docker.sock -v /dev:/host/dev -v /proc:/host/proc:ro --name NAME IMAGE"
-
-COPY --from=builder /falco /
-
-ENV HOST_ROOT /host
-ENV HOME /root
-
-CMD ["/usr/bin/falco", "-o", "time_format_iso_8601=true"]

userspace/engine/falco_engine.cpp

@@ -237,7 +237,7 @@ std::unique_ptr<load_result> falco_engine::load_rules_file(const string &rules_f
 
 		res->add_error(load_result::LOAD_ERR_FILE_READ, e.what(), ctx);
 
-		return std::move(res);
+		return res;
 	}
 
 	return load_rules(rules_content, rules_filename);

userspace/falco/app_actions/compute_syscall_buffer_size.cpp

@@ -28,7 +28,7 @@ application::run_result application::configure_syscall_buffer_size()
 	/* We don't need to compute the syscall buffer dimension if we are in capture mode or if the
 	 * the syscall source is not enabled.
 	 */
-	if(is_capture_mode() || m_state->enabled_sources.find(falco_common::syscall_source) == m_state->enabled_sources.end())
+	if(is_capture_mode() || m_state->enabled_sources.find(falco_common::syscall_source) == m_state->enabled_sources.end() || is_gvisor_enabled())
 	{
 		return run_result::ok();
 	}

userspace/falco/app_actions/init_falco_engine.cpp

@@ -29,11 +29,21 @@ void application::configure_output_format()
 		output_format = "container=%container.name (id=%container.id)";
 		replace_container_info = true;
 	}
+	else if(m_options.print_additional == "cg" || m_options.print_additional == "container-gvisor")
+	{
+		output_format = "container=%container.name (id=%container.id) vpid=%proc.vpid vtid=%thread.vtid";
+		replace_container_info = true;
+	}
 	else if(m_options.print_additional == "k" || m_options.print_additional == "kubernetes")
 	{
 		output_format = "k8s.ns=%k8s.ns.name k8s.pod=%k8s.pod.name container=%container.id";
 		replace_container_info = true;
 	}
+	else if(m_options.print_additional == "kg" || m_options.print_additional == "kubernetes-gvisor")
+	{
+		output_format = "k8s.ns=%k8s.ns.name k8s.pod=%k8s.pod.name container=%container.id vpid=%proc.vpid vtid=%thread.vtid";
+		replace_container_info = true;
+	}
 	else if(m_options.print_additional == "m" || m_options.print_additional == "mesos")
 	{
 		output_format = "task=%mesos.task.name container=%container.id";
@@ -44,11 +54,6 @@ void application::configure_output_format()
 		output_format = m_options.print_additional;
 		replace_container_info = false;
 	}
-	else if(m_options.gvisor_config != "")
-	{
-		output_format = "container=%container.name (id=%container.id) vpid=%proc.vpid vtid=%thread.vtid";
-		replace_container_info = true;
-	}
 
 	if(!output_format.empty())
 	{