diff --git a/README.md b/README.md index 293d5fe..02d2b28 100644 --- a/README.md +++ b/README.md @@ -159,8 +159,11 @@ line to the `/etc/ld.so.preload` configuration file: The format of this configuration file is a whitespace-separated list, so it's good practice to put each library on a separate line. -On Debian systems `libhardened_malloc.so` should be installed into `/usr/lib/` -to avoid preload failures caused by AppArmor profile restrictions. +For maximum compatibility `libhardened_malloc.so` can be installed into +`/usr/lib/` to avoid preload failures caused by AppArmor profiles or systemd +ExecPaths= restrictions. Check for logs of the following format: + + ERROR: ld.so: object '/usr/local/lib/libhardened_malloc.so' from /etc/ld.so.preload cannot be preloaded (failed to map segment from shared object): ignored. Using the `LD_PRELOAD` environment variable to load it on a case-by-case basis will not work when `AT_SECURE` is set such as with setuid binaries. It's also diff --git a/androidtest/memtag/memtag_test.cc b/androidtest/memtag/memtag_test.cc index f858292..eeb15ec 100644 --- a/androidtest/memtag/memtag_test.cc +++ b/androidtest/memtag/memtag_test.cc @@ -44,7 +44,7 @@ void *set_pointer_tag(void *ptr, u8 tag) { return (void *) (((uintptr_t) tag << 56) | (uintptr_t) untag_pointer(ptr)); } -// This test checks that slab slot allocation uses tag that is distint from tags of its neighbors +// This test checks that slab slot allocation uses tag that is distinct from tags of its neighbors // and from the tag of the previous allocation that used the same slot void tag_distinctness() { // tag 0 is reserved diff --git a/test/test_smc.py b/test/test_smc.py index 170278e..9c20094 100644 --- a/test/test_smc.py +++ b/test/test_smc.py @@ -98,7 +98,7 @@ def test_invalid_free_unprotected(self): self.assertEqual(stderr.decode("utf-8"), "fatal allocator error: invalid free\n") - def test_invalid_malloc_usable_size_small_quarantene(self): + def test_invalid_malloc_usable_size_small_quarantine(self): _stdout, stderr, returncode = self.run_test( "invalid_malloc_usable_size_small_quarantine") self.assertEqual(returncode, -6)