Skip to content

ROX-9409: removes PROBE_NAME and PROBE_VERSION #3

Merged
Stringy merged 3 commits intomauro/pull-falco-20220428from
giles/ROX-9409-setting-probe-name-and-probe-version
May 13, 2022
Merged

ROX-9409: removes PROBE_NAME and PROBE_VERSION #3
Stringy merged 3 commits intomauro/pull-falco-20220428from
giles/ROX-9409-setting-probe-name-and-probe-version

Conversation

@Stringy
Copy link
Collaborator

@Stringy Stringy commented Feb 22, 2022

In favour of DRIVER_NAME and DRIVER_VERSION used by userspace/libscap/CMakeLists.txt

This will not be upstreamed, since these configuration options exist on upstream already. This will be accompanied by a similar PR in the collector repo, to use these DRIVER_* variables as well.

@Stringy Stringy requested a review from Molter73 February 22, 2022 10:53
@Stringy
Copy link
Collaborator Author

Stringy commented Feb 22, 2022

Just realised I forgot to remove all the other instances of PROBE_NAME and PROBE_VERSION, I'll quickly push those changes up

@Molter73
Copy link
Contributor

I'm seeing that most of the changes to rename PROBE_VERSION and PROBE_NAME have actually been made a couple of weeks ago and have not been pulled yet to our repo, meaning we might be facing a large number of conflicts with this PR.

Would it make sense to try and pull the latest changes of falco into our repo before making this change? Last time a tried there were a significant number of conflicts, but I'm up for it.

@Stringy Stringy force-pushed the giles/ROX-9409-setting-probe-name-and-probe-version branch 3 times, most recently from 19c5481 to f1a8ddb Compare March 10, 2022 15:31
Copy link
Contributor

@Molter73 Molter73 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@Stringy Stringy requested a review from a team March 28, 2022 11:08
@JoukoVirtanen JoukoVirtanen self-requested a review March 30, 2022 20:48
Copy link

@JoukoVirtanen JoukoVirtanen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@Stringy Stringy force-pushed the giles/ROX-9409-setting-probe-name-and-probe-version branch from f1a8ddb to dc9da45 Compare April 29, 2022 14:06
@Stringy Stringy force-pushed the giles/ROX-9409-setting-probe-name-and-probe-version branch from dc9da45 to 49bace8 Compare May 6, 2022 10:50
@Stringy Stringy changed the base branch from master to mauro/pull-falco-20220428 May 6, 2022 10:52
@Stringy Stringy merged commit 4a01ee6 into mauro/pull-falco-20220428 May 13, 2022
Stringy pushed a commit that referenced this pull request Feb 26, 2026
glibc-2.42 added __inet_ntop_chk fortification, which started to fail:

  *** buffer overflow detected ***: terminated
  Program received signal SIGABRT, Aborted.
  0x00007ffff629b0dc in __pthread_kill_implementation () from /lib64/libc.so.6
  (gdb) bt
  #0  0x00007ffff629b0dc in __pthread_kill_implementation () from /lib64/libc.so.6
  #1  0x00007ffff6242572 in raise () from /lib64/libc.so.6
  #2  0x00007ffff6229f3b in abort () from /lib64/libc.so.6
  #3  0x00007ffff622b148 in __libc_message_impl.cold () from /lib64/libc.so.6
  #4  0x00007ffff6327337 in __fortify_fail () from /lib64/libc.so.6
  #5  0x00007ffff6326c92 in __chk_fail () from /lib64/libc.so.6
  #6  0x00007ffff6327a62 in __inet_ntop_chk () from /lib64/libc.so.6
  #7  0x000055555569da3d in inet_ntop (__af=10, __src=0x555555ee0800, __dst=0x7fffffff4f90 "\260P\377\377\377\177", __dst_size=100) at /usr/include/bits/inet-fortified.h:36
  #8  ipv6tuple_to_string[abi:cxx11](ipv6tuple*, bool) (tuple=0x555555ee0800, resolve=false) at /tmp/portage/dev-debug/sysdig-0.40.1/work/libs-0.20.0/userspace/libsinsp/utils.c

Use INET6_ADDRSTRLEN as destination buffer size.

Fixes: falcosecurity/libs#2573
Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants