[yocto] [meta-security][PATCH] samhain: hash fix for aarch64 and mips64

mingli.yu at windriver.com mingli.yu at windriver.com
Wed Apr 3 01:55:14 PDT 2019


From: Mingli Yu <Mingli.Yu at windriver.com>

samhain fails on both aarch64 and mips64 targets with:
| samhain[3013]: FATAL: x_dnmalloc.c: 2790: hashval < AMOUNTHASH

Though there is already a patch samhain-mips64-aarch64-dnmalloc-hash-fix.patch
to fix this issue, the logic is incomplete and
pass -DCONFIG_ARCH_MIPS64=1 and -DCONFIG_ARCH_AARCH64=1
during do_configure phase respectively to fix the
issue.

Signed-off-by: Mingli Yu <Mingli.Yu at windriver.com>
---
 recipes-security/samhain/samhain.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/recipes-security/samhain/samhain.inc b/recipes-security/samhain/samhain.inc
index dcd72b9..90da813 100644
--- a/recipes-security/samhain/samhain.inc
+++ b/recipes-security/samhain/samhain.inc
@@ -97,6 +97,11 @@ EOF
 
 do_configure () {
 	autoconf -f
+	if [ "${TARGET_ARCH}" = "mips64" ]; then
+	    export CFLAGS="${CFLAGS} -DCONFIG_ARCH_MIPS64=1"
+	elif [ "${TARGET_ARCH}" = "aarch64" ]; then
+	    export CFLAGS="${CFLAGS} -DCONFIG_ARCH_AARCH64=1"
+	fi
 	./configure \
 	--build=${BUILD_SYS} \
 	--host=${HOST_SYS} \
-- 
2.7.4



More information about the yocto mailing list