diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-security/recipes-security/samhain/files/samhain-mips64-aarch64-dnmalloc-hash-fix.patch | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
| download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz | |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-security/recipes-security/samhain/files/samhain-mips64-aarch64-dnmalloc-hash-fix.patch')
| -rw-r--r-- | meta-security/recipes-security/samhain/files/samhain-mips64-aarch64-dnmalloc-hash-fix.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/meta-security/recipes-security/samhain/files/samhain-mips64-aarch64-dnmalloc-hash-fix.patch b/meta-security/recipes-security/samhain/files/samhain-mips64-aarch64-dnmalloc-hash-fix.patch deleted file mode 100644 index 060866068..000000000 --- a/meta-security/recipes-security/samhain/files/samhain-mips64-aarch64-dnmalloc-hash-fix.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit 0f6bdc219e598de08a3f37887efa5dfa50e2b996 -Author: Aws Ismail <aws.ismail@windriver.com> -Date: Fri Jun 22 15:47:08 2012 -0400 - -Hash fix for MIPS64 and AARCH64 - -Samhain uses the addresses of local variables in generating hash -values. The hashing function is designed only for 32-bit values. -For MIPS64 when a 64-bit address is passed in the resulting hash -exceeds the limits of the underlying mechanism and samhain -ultimately fails. The solution is to simply take the lower -32-bits of the address and use that in generating hash values. - -Signed-off-by: Greg Moffatt <greg.moffatt@windriver.com> - -Upstream-Status: Pending - -Signed-off-by: Aws Ismail <aws.ismail@windriver.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> - -diff --git a/src/dnmalloc.c b/src/dnmalloc.c -index da9a5c5..fc91400 100644 ---- a/src/dnmalloc.c -+++ b/src/dnmalloc.c -@@ -2703,11 +2703,19 @@ static void freecilst_add(chunkinfoptr p) { - } - - /* Calculate the hash table entry for a chunk */ -+#if defined(CONFIG_ARCH_MIPS64) || defined(CONFIG_ARCH_AARCH64) -+#ifdef STARTHEAP_IS_ZERO -+#define hash(p) ((((unsigned long) p) & 0x7fffffff) >> 7) -+#else -+#define hash(p) ((((unsigned long) p - (unsigned long) startheap) & 0x7fffffff) >> 7) -+#endif -+#else - #ifdef STARTHEAP_IS_ZERO - #define hash(p) (((unsigned long) p) >> 7) - #else - #define hash(p) (((unsigned long) p - (unsigned long) startheap) >> 7) - #endif -+#endif /* CONFIG_ARCH_MIPS64 */ - - static void - hashtable_add (chunkinfoptr ci) |