From: Ilya Leoshkevich <iii@linux.ibm.com>
To: Alexander Gordeev <agordeev@linux.ibm.com>,
Alexander Potapenko <glider@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Christoph Lameter <cl@linux.com>,
David Rientjes <rientjes@google.com>,
Heiko Carstens <hca@linux.ibm.com>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>,
Marco Elver <elver@google.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
Pekka Enberg <penberg@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Vasily Gorbik <gor@linux.ibm.com>,
Vlastimil Babka <vbabka@suse.cz>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>,
Dmitry Vyukov <dvyukov@google.com>,
Hyeonggon Yoo <42.hyeyoo@gmail.com>,
kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, linux-s390@vger.kernel.org,
linux-trace-kernel@vger.kernel.org,
Mark Rutland <mark.rutland@arm.com>,
Roman Gushchin <roman.gushchin@linux.dev>,
Sven Schnelle <svens@linux.ibm.com>,
Ilya Leoshkevich <iii@linux.ibm.com>
Subject: [PATCH v3 12/34] kmsan: Support SLAB_POISON
Date: Thu, 14 Dec 2023 00:24:32 +0100 [thread overview]
Message-ID: <20231213233605.661251-13-iii@linux.ibm.com> (raw)
In-Reply-To: <20231213233605.661251-1-iii@linux.ibm.com>
Avoid false KMSAN negatives with SLUB_DEBUG by allowing
kmsan_slab_free() to poison the freed memory, and by preventing
init_object() from unpoisoning new allocations by using __memset().
There are two alternatives to this approach. First, init_object()
can be marked with __no_sanitize_memory. This annotation should be used
with great care, because it drops all instrumentation from the
function, and any shadow writes will be lost. Even though this is not a
concern with the current init_object() implementation, this may change
in the future.
Second, kmsan_poison_memory() calls may be added after memset() calls.
The downside is that init_object() is called from
free_debug_processing(), in which case poisoning will erase the
distinction between simply uninitialized memory and UAF.
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
mm/kmsan/hooks.c | 2 +-
mm/slub.c | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/mm/kmsan/hooks.c b/mm/kmsan/hooks.c
index 3acf010c9814..21004eeee240 100644
--- a/mm/kmsan/hooks.c
+++ b/mm/kmsan/hooks.c
@@ -74,7 +74,7 @@ void kmsan_slab_free(struct kmem_cache *s, void *object)
return;
/* RCU slabs could be legally used after free within the RCU period */
- if (unlikely(s->flags & (SLAB_TYPESAFE_BY_RCU | SLAB_POISON)))
+ if (unlikely(s->flags & SLAB_TYPESAFE_BY_RCU))
return;
/*
* If there's a constructor, freed memory must remain in the same state
diff --git a/mm/slub.c b/mm/slub.c
index 63d281dfacdb..b111bc315e3f 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1030,7 +1030,12 @@ static void init_object(struct kmem_cache *s, void *object, u8 val)
unsigned int poison_size = s->object_size;
if (s->flags & SLAB_RED_ZONE) {
- memset(p - s->red_left_pad, val, s->red_left_pad);
+ /*
+ * Use __memset() here and below in order to avoid overwriting
+ * the KMSAN shadow. Keeping the shadow makes it possible to
+ * distinguish uninit-value from use-after-free.
+ */
+ __memset(p - s->red_left_pad, val, s->red_left_pad);
if (slub_debug_orig_size(s) && val == SLUB_RED_ACTIVE) {
/*
@@ -1043,12 +1048,12 @@ static void init_object(struct kmem_cache *s, void *object, u8 val)
}
if (s->flags & __OBJECT_POISON) {
- memset(p, POISON_FREE, poison_size - 1);
- p[poison_size - 1] = POISON_END;
+ __memset(p, POISON_FREE, poison_size - 1);
+ __memset(p + poison_size - 1, POISON_END, 1);
}
if (s->flags & SLAB_RED_ZONE)
- memset(p + poison_size, val, s->inuse - poison_size);
+ __memset(p + poison_size, val, s->inuse - poison_size);
}
static void restore_bytes(struct kmem_cache *s, char *message, u8 data,
--
2.43.0
next prev parent reply other threads:[~2023-12-13 23:37 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-13 23:24 [PATCH v3 00/34] kmsan: Enable on s390 Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 01/34] ftrace: Unpoison ftrace_regs in ftrace_ops_list_func() Ilya Leoshkevich
2024-01-02 15:17 ` Steven Rostedt
2024-06-12 15:37 ` Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 02/34] kmsan: Make the tests compatible with kmsan.panic=1 Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 03/34] kmsan: Disable KMSAN when DEFERRED_STRUCT_PAGE_INIT is enabled Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 04/34] kmsan: Increase the maximum store size to 4096 Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 05/34] kmsan: Fix is_bad_asm_addr() on arches with overlapping address spaces Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 06/34] kmsan: Fix kmsan_copy_to_user() " Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 07/34] kmsan: Remove a useless assignment from kmsan_vmap_pages_range_noflush() Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 08/34] kmsan: Remove an x86-specific #include from kmsan.h Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 09/34] kmsan: Expose kmsan_get_metadata() Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 10/34] kmsan: Export panic_on_kmsan Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 11/34] kmsan: Allow disabling KMSAN checks for the current task Ilya Leoshkevich
2023-12-13 23:24 ` Ilya Leoshkevich [this message]
2023-12-13 23:24 ` [PATCH v3 13/34] kmsan: Use ALIGN_DOWN() in kmsan_get_metadata() Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 14/34] mm: slub: Let KMSAN access metadata Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 15/34] mm: slub: Unpoison the memchr_inv() return value Ilya Leoshkevich
2024-01-02 16:10 ` Vlastimil Babka
2023-12-13 23:24 ` [PATCH v3 16/34] mm: kfence: Disable KMSAN when checking the canary Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 17/34] lib/zlib: Unpoison DFLTCC output buffers Ilya Leoshkevich
2023-12-22 11:35 ` Alexander Potapenko
2023-12-13 23:24 ` [PATCH v3 18/34] kmsan: Accept ranges starting with 0 on s390 Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 19/34] s390: Turn off KMSAN for boot, vdso and purgatory Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 20/34] s390: Use a larger stack for KMSAN Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 21/34] s390/boot: Add the KMSAN runtime stub Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 22/34] s390/checksum: Add a KMSAN check Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 23/34] s390/cpacf: Unpoison the results of cpacf_trng() Ilya Leoshkevich
2024-01-02 14:34 ` Heiko Carstens
2023-12-13 23:24 ` [PATCH v3 24/34] s390/cpumf: Unpoison STCCTM output buffer Ilya Leoshkevich
2023-12-20 11:04 ` Alexander Potapenko
2024-01-02 14:38 ` Heiko Carstens
2023-12-13 23:24 ` [PATCH v3 25/34] s390/diag: Unpoison diag224() " Ilya Leoshkevich
2024-01-02 14:56 ` Heiko Carstens
2023-12-13 23:24 ` [PATCH v3 26/34] s390/ftrace: Unpoison ftrace_regs in kprobe_ftrace_handler() Ilya Leoshkevich
2024-01-02 14:56 ` Heiko Carstens
2023-12-13 23:24 ` [PATCH v3 27/34] s390/irqflags: Do not instrument arch_local_irq_*() with KMSAN Ilya Leoshkevich
2023-12-22 11:27 ` Alexander Potapenko
2024-01-02 15:01 ` Heiko Carstens
2023-12-13 23:24 ` [PATCH v3 28/34] s390/mm: Define KMSAN metadata for vmalloc and modules Ilya Leoshkevich
2023-12-21 12:14 ` Alexander Gordeev
2024-01-02 15:05 ` Heiko Carstens
2024-01-04 10:03 ` Alexander Gordeev
2024-01-04 11:34 ` Heiko Carstens
2023-12-13 23:24 ` [PATCH v3 29/34] s390/string: Add KMSAN support Ilya Leoshkevich
2024-01-02 15:05 ` Heiko Carstens
2023-12-13 23:24 ` [PATCH v3 30/34] s390/traps: Unpoison the kernel_stack_overflow()'s pt_regs Ilya Leoshkevich
2024-01-02 15:06 ` Heiko Carstens
2023-12-13 23:24 ` [PATCH v3 31/34] s390/uaccess: Add KMSAN support to put_user() and get_user() Ilya Leoshkevich
2023-12-13 23:24 ` [PATCH v3 32/34] s390/unwind: Disable KMSAN checks Ilya Leoshkevich
2024-01-02 15:09 ` Heiko Carstens
2023-12-13 23:24 ` [PATCH v3 33/34] s390: Implement the architecture-specific kmsan functions Ilya Leoshkevich
2023-12-20 11:27 ` Alexander Potapenko
2024-01-02 15:14 ` Heiko Carstens
2023-12-13 23:24 ` [PATCH v3 34/34] kmsan: Enable on s390 Ilya Leoshkevich
2024-01-02 15:15 ` Heiko Carstens
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231213233605.661251-13-iii@linux.ibm.com \
--to=iii@linux.ibm.com \
--cc=42.hyeyoo@gmail.com \
--cc=agordeev@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=borntraeger@linux.ibm.com \
--cc=cl@linux.com \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=glider@google.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mhiramat@kernel.org \
--cc=penberg@kernel.org \
--cc=rientjes@google.com \
--cc=roman.gushchin@linux.dev \
--cc=rostedt@goodmis.org \
--cc=svens@linux.ibm.com \
--cc=vbabka@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).