Skip to contentSkip to conversation

samhain: hash fix for aarch64 and mips64

PATCH In review [email protected] 3 participants 3 messages Apr 3, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 samhain: hash fix for aarch64 and mips64

From: Mingli Yu <[email protected]>

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.

---
 recipes-security/samhain/samhain.inc | 5 +++++
 1 file changed, 5 insertions(+)
recipes-security/samhain/samhain.inc +5 -0
index dcd72b9..90da813 100644
@@ -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} \
Signature · 1 line
2.7.4
#1 lore raw
Quoted 10 lines · On 4/3/19 1:55 AM, [email protected] wrote:

From: Mingli Yu <[email protected]>

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.

This does not apply. Can you rebase with master.

thanks,
Armin

Quoted 22 lines
---
 recipes-security/samhain/samhain.inc | 5 +++++
 1 file changed, 5 insertions(+)
recipes-security/samhain/samhain.inc +5 -0
index dcd72b9..90da813 100644
@@ -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 lore raw
In reply to [email protected]
Quoted 11 lines · On Wed, Apr 03, 2019 at 04:55:14PM +0800, [email protected] wrote:

From: Mingli Yu <[email protected]>

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.
...

In master this has already been workarounded with --disable-dnmalloc.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed