Skip to contentSkip to conversation

kfence: zero guard page after out-of-bounds access

PATCH Applied Marco Elver 2 participants 2 messages Mar 12, 2021

Subsystems (2)
lore
Share & tools
lore

Marco Elver

author maintainer
#0 lore raw

PATCH 1/1 kfence: zero guard page after out-of-bounds access

After an out-of-bounds accesses, zero the guard page before re-protecting in kfence_guarded_free(). On one hand this helps make the failure mode of subsequent out-of-bounds accesses more deterministic, but could also prevent certain information leaks.

---
 mm/kfence/core.c | 1 +
 1 file changed, 1 insertion(+)
mm/kfence/core.c +1 -0
index 3b8ec938470a..f7106f28443d 100644
@@ -371,6 +371,7 @@ static void kfence_guarded_free(void *addr, struct kfence_metadata *meta, bool z
 
 	/* Restore page protection if there was an OOB access. */
 	if (meta->unprotected_page) {
+		memzero_explicit((void *)ALIGN_DOWN(meta->unprotected_page, PAGE_SIZE), PAGE_SIZE);
 		kfence_protect(meta->unprotected_page);
 		meta->unprotected_page = 0;
 	}
Signature · 1 line
2.31.0.rc2.261.g7f71774620-goog
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Marco Elver

After an out-of-bounds accesses, zero the guard page before re-protecting in kfence_guarded_free(). On one hand this helps make the failure mode of subsequent out-of-bounds accesses more deterministic, but could also prevent certain information leaks.

Quoted 19 lines
---
 mm/kfence/core.c | 1 +
 1 file changed, 1 insertion(+)
mm/kfence/core.c +1 -1
index 3b8ec938470a..f7106f28443d 100644
@@ -371,6 +371,7 @@ static void kfence_guarded_free(void *addr, struct kfence_metadata *meta, bool z
 
        /* Restore page protection if there was an OOB access. */
        if (meta->unprotected_page) {
+               memzero_explicit((void *)ALIGN_DOWN(meta->unprotected_page, PAGE_SIZE), PAGE_SIZE);
                kfence_protect(meta->unprotected_page);
                meta->unprotected_page = 0;
        }
--

2.31.0.rc2.261.g7f71774620-goog

Signature · 10 lines
Alexander Potapenko
Software Engineer

Google Germany GmbH
Erika-Mann-Straße, 33
80636 München

Geschäftsführer: Paul Manicle, Halimah DeLaine Prado
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg