Merge de4df3d119 into ff99511eb4

Fix two typos
ReadMe: adjust section about library location
2025-11-03 17:26:32 +01:00 · 2025-09-21 10:24:24 +00:00 · 2025-09-21 12:24:16 +02:00 · 2025-09-21 12:24:16 +02:00 · 2025-09-17 11:03:53 -04:00
3 changed files with 9 additions and 9 deletions
--- a/README.md
+++ b/README.md
@ -65,14 +65,14 @@ used instead as this allocator fundamentally doesn't support that environment.

 ## Dependencies

-Debian stable (currently Debian 12) determines the most ancient set of
+Debian stable (currently Debian 13) determines the most ancient set of
 supported dependencies:

-* glibc 2.36
-* Linux 6.1
-* Clang 14.0.6 or GCC 12.2.0
+* glibc 2.41
+* Linux 6.12
+* Clang 19.1.7 or GCC 14.2.0

-For Android, the Linux GKI 5.10, 5.15 and 6.1 branches are supported.
+For Android, the Linux GKI 6.1, 6.6 and 6.12 branches are supported.

 However, using more recent releases is highly recommended. Older versions of
 the dependencies may be compatible at the moment but are not tested and will
@ -83,7 +83,7 @@ there will be custom integration offering better performance in the future
 along with other hardening for the C standard library implementation.

 For Android, only the current generation, actively developed maintenance branch of the Android
-Open Source Project will be supported, which currently means `android15-release`.
+Open Source Project will be supported, which currently means `android16-release`.

 ## Testing

@ -160,7 +160,7 @@ The format of this configuration file is a whitespace-separated list, so it's
 good practice to put each library on a separate line.

 For maximum compatibility `libhardened_malloc.so` can be installed into
-`/usr/lib/` to avoid preload failures caused by AppArmor profile or systemd
+`/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.
--- 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
--- a/test/test_smc.py
+++ b/test/test_smc.py
@ -98,7 +98,7 @@ class TestSimpleMemoryCorruption(unittest.TestCase):
        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)
Author	SHA1	Message	Date
cgzones	e82a66a162	Merge `de4df3d119` into `ff99511eb4`	2025-09-21 10:24:24 +00:00
Christian Göttsche	de4df3d119	Fix two typos	2025-09-21 12:24:16 +02:00
Christian Göttsche	ffcfeee69f	ReadMe: adjust section about library location	2025-09-21 12:24:16 +02:00
charles25565	ff99511eb4	Update dependencies in README Update from bookworm to trixie, updating GKIs, and changing to Android 16.	2025-09-17 11:03:53 -04:00