diff options
author | Holger Hoffstätte <holger@applied-asynchrony.com> | 2024-03-11 16:34:09 +0100 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2024-03-12 02:50:32 +0000 |
commit | 8534c90299b019823f5f221a0875786e64e8c03c (patch) | |
tree | f74af65102b54ebccaec757372230b13580cf923 /dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.8+.patch | |
parent | app-misc/gcal: fix ncurses detection w/ split tinfo (diff) | |
download | gentoo-8534c90299b019823f5f221a0875786e64e8c03c.tar.gz gentoo-8534c90299b019823f5f221a0875786e64e8c03c.tar.bz2 gentoo-8534c90299b019823f5f221a0875786e64e8c03c.zip |
dev-debug/scap-driver: fix build on kernel 6.8
Closes: https://bugs.gentoo.org/926768
Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/35712
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.8+.patch')
-rw-r--r-- | dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.8+.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.8+.patch b/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.8+.patch new file mode 100644 index 000000000000..b33ba164b97a --- /dev/null +++ b/dev-debug/scap-driver/files/0.29.3-fix-kmod-build-on-6.8+.patch @@ -0,0 +1,44 @@ + +Bug: https://bugs.gentoo.org/926768 +Minimal subset of changes from: https://github.com/falcosecurity/libs/pull/1632 + +--- a/driver/ppm_events.c 2024-03-11 15:19:23.000000000 +0100 ++++ b/driver/ppm_events.c 2024-03-11 15:22:48.230598879 +0100 +@@ -624,12 +624,16 @@ int val_to_ring(struct event_filler_argu + if (unlikely(len < 0)) + return PPM_FAILURE_INVALID_USER_MEMORY; + } else { +- len = (int)strlcpy(args->buffer + args->arg_data_offset, ++ len = (int)strscpy(args->buffer + args->arg_data_offset, + (const char *)(syscall_arg_t)val, + max_arg_size); + +- if (++len > (int)max_arg_size) ++ if (len == -E2BIG) { + len = max_arg_size; ++ } else { ++ len++; ++ } ++ + } + + /* +@@ -640,12 +644,15 @@ int val_to_ring(struct event_filler_argu + /* + * Handle NULL pointers + */ +- len = (int)strlcpy(args->buffer + args->arg_data_offset, ++ len = (int)strscpy(args->buffer + args->arg_data_offset, + "(NULL)", + max_arg_size); + +- if (++len > (int)max_arg_size) +- len = max_arg_size; ++ if (len == -E2BIG) { ++ len = max_arg_size; ++ } else { ++ len++; ++ } + } + + break; |