* [meta-security][PATCH] samhain: dnmalloc hash fix for aarch64 and mips64
@ 2020-04-20 6:27 Haseeb Ashraf
2020-06-19 23:44 ` [yocto] " Armin Kuster
0 siblings, 1 reply; 2+ messages in thread
From: Haseeb Ashraf @ 2020-04-20 6:27 UTC (permalink / raw)
To: yocto
fix runtime error:
samhain[4069]: FATAL: x_dnmalloc.c: 2790: hashval < AMOUNTHASH
Killed
The proper fix is not to disable dnmalloc. This change is in
continuation of samhain-mips64-aarch64-dnmalloc-hash-fix.patch
which requires CONFIG_ARCH_AARCH64 or CONFIG_ARCH_MIPS64 to be
defined for the corresponding architecture
Signed-off-by: Haseeb Ashraf <Haseeb_Ashraf@mentor.com>
---
recipes-ids/samhain/samhain.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/recipes-ids/samhain/samhain.inc b/recipes-ids/samhain/samhain.inc
index 0a5e432..b867bbc 100644
--- a/recipes-ids/samhain/samhain.inc
+++ b/recipes-ids/samhain/samhain.inc
@@ -67,6 +67,9 @@ PACKAGECONFIG[acl] = " --enable-posix-acl , --disable-posix-acl, acl"
PACKAGECONFIG[audit] = "ac_cv_header_auparse_h=yes,ac_cv_header_auparse_h=no,audit"
PACKAGECONFIG[ps] = "--with-ps-path=${base_bindir}/ps,,,procps"
+EXTRA_OEMAKE_append_aarch64 = " CPPFLAGS+=-DCONFIG_ARCH_AARCH64=1"
+EXTRA_OEMAKE_append_mips64 = " CPPFLAGS+=-DCONFIG_ARCH_MIPS64=1"
+
do_unpack_samhain() {
cd ${WORKDIR}
tar -xzvf samhain-${PV}.tar.gz
@@ -118,7 +121,6 @@ do_configure () {
--enable-network=${SAMHAIN_MODE} \
--with-pid-file=${localstatedir}/run/samhain.pid \
--with-data-file=${localstatedir}/lib/samhain/samhain_file \
- --disable-dnmalloc \
${EXTRA_OECONF}
}
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [yocto] [meta-security][PATCH] samhain: dnmalloc hash fix for aarch64 and mips64
2020-04-20 6:27 [meta-security][PATCH] samhain: dnmalloc hash fix for aarch64 and mips64 Haseeb Ashraf
@ 2020-06-19 23:44 ` Armin Kuster
0 siblings, 0 replies; 2+ messages in thread
From: Armin Kuster @ 2020-06-19 23:44 UTC (permalink / raw)
To: yocto
[-- Attachment #1: Type: text/plain, Size: 1515 bytes --]
merged
On 4/19/20 11:27 PM, Haseeb Ashraf wrote:
> fix runtime error:
> samhain[4069]: FATAL: x_dnmalloc.c: 2790: hashval < AMOUNTHASH
> Killed
>
> The proper fix is not to disable dnmalloc. This change is in
> continuation of samhain-mips64-aarch64-dnmalloc-hash-fix.patch
> which requires CONFIG_ARCH_AARCH64 or CONFIG_ARCH_MIPS64 to be
> defined for the corresponding architecture
>
> Signed-off-by: Haseeb Ashraf <Haseeb_Ashraf@mentor.com>
> ---
> recipes-ids/samhain/samhain.inc | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/recipes-ids/samhain/samhain.inc b/recipes-ids/samhain/samhain.inc
> index 0a5e432..b867bbc 100644
> --- a/recipes-ids/samhain/samhain.inc
> +++ b/recipes-ids/samhain/samhain.inc
> @@ -67,6 +67,9 @@ PACKAGECONFIG[acl] = " --enable-posix-acl , --disable-posix-acl, acl"
> PACKAGECONFIG[audit] = "ac_cv_header_auparse_h=yes,ac_cv_header_auparse_h=no,audit"
> PACKAGECONFIG[ps] = "--with-ps-path=${base_bindir}/ps,,,procps"
>
> +EXTRA_OEMAKE_append_aarch64 = " CPPFLAGS+=-DCONFIG_ARCH_AARCH64=1"
> +EXTRA_OEMAKE_append_mips64 = " CPPFLAGS+=-DCONFIG_ARCH_MIPS64=1"
> +
> do_unpack_samhain() {
> cd ${WORKDIR}
> tar -xzvf samhain-${PV}.tar.gz
> @@ -118,7 +121,6 @@ do_configure () {
> --enable-network=${SAMHAIN_MODE} \
> --with-pid-file=${localstatedir}/run/samhain.pid \
> --with-data-file=${localstatedir}/lib/samhain/samhain_file \
> - --disable-dnmalloc \
> ${EXTRA_OECONF}
> }
>
>
>
[-- Attachment #2: Type: text/html, Size: 2021 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-19 23:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-20 6:27 [meta-security][PATCH] samhain: dnmalloc hash fix for aarch64 and mips64 Haseeb Ashraf
2020-06-19 23:44 ` [yocto] " Armin Kuster
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.