From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A07FCECAAD3 for ; Sat, 10 Sep 2022 23:12:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 241676B0072; Sat, 10 Sep 2022 19:12:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F09A6B0073; Sat, 10 Sep 2022 19:12:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0B8F96B0074; Sat, 10 Sep 2022 19:12:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id EFFD16B0072 for ; Sat, 10 Sep 2022 19:12:17 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id C34FD8018F for ; Sat, 10 Sep 2022 23:12:17 +0000 (UTC) X-FDA: 79897726314.05.E2AEE9A Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by imf25.hostedemail.com (Postfix) with ESMTP id 6A3E2A00A6 for ; Sat, 10 Sep 2022 23:12:17 +0000 (UTC) Received: by mail-qk1-f178.google.com with SMTP id d15so3738115qka.9 for ; Sat, 10 Sep 2022 16:12:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=1qAOHyl0ZytUGK0LKmP2phdfOjsGHVNHqllONgN6fKY=; b=mwZQUBhTeAzkTF8xxYrlGo8hF8qHq4dcf2rSQVSfUettUq6InYxFR8fpF4QMoSceAN RoRZV4iOGW14ERDM/zH2z6/y5uwBgFJ6Vw5paH6adAvG6kDmcwmjzVHOW6t8l+6mzWhI 19QkDWEILoadygJBRB6OpPDLGyvEhqUERYWp0a46U3cIb1YdZoghY3P764lvdzRqM7Yf Lq4omeoMa7H0Qtb3sTYu4tSj4l3gQ9WUseXQCyTXw06W65FOwhxeK/ic2ORpO/E+hnke LtV/7zzO1bSWM5vtsjEb2N09U7H0nGbYahtuGdbd5s7NQjPN8Rnq7ORAO5CC7BM+rLyc baFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=1qAOHyl0ZytUGK0LKmP2phdfOjsGHVNHqllONgN6fKY=; b=dCB+zphvnH7AJQhwSF8S9bcrmw7FsHRqtUGrsfQsuczv3SbcJFh8n8yiS0siIwpHAm wHWl0ox/vJL9t+wTE6N1xg8CBnUGFDWvFnxNGPI7ymBRPJV1f06X7aLHk38eeqV22Tc3 ioFRvQfSe0O5Oz9sjpBYd2ESkU+Ek0YPIzFFZuE8ulJDBFG/aAX14sRY4F3b1eHxJlv/ 4a4kBbJFBcuWnUaujsCSPOjVBj7IcEAkpo6X+2ZxJ/NMT9eOJpu5I6i9VGCCT1ej76xR uXKBqdQ0x9t/p/x7T7ehhc2zWJ8P3hgq+u1z/I0Qykn/RuET5HtHQJUB2D2wjI3ivWZa iqWQ== X-Gm-Message-State: ACgBeo1xW4i327HWMvdGh6Wp9zcPHWuRR8YHLZM3bPHbOwJ4LHa5baWQ gZZrynBOU6cpHIgo2+f3s8+U+BCSkmMLLz3QkkY= X-Google-Smtp-Source: AA6agR62AluZGb9Ks2brmA4j58myrTw8x2kq+ZKGD56YZvnh3QLJg0zqXmag9qouK4TB3QKuwjVqquVIveUPbmD+tDI= X-Received: by 2002:a05:620a:25ca:b0:6b8:7633:baf with SMTP id y10-20020a05620a25ca00b006b876330bafmr15148666qko.515.1662851536678; Sat, 10 Sep 2022 16:12:16 -0700 (PDT) MIME-Version: 1.0 References: <20220907071023.3838692-1-feng.tang@intel.com> <20220907071023.3838692-5-feng.tang@intel.com> In-Reply-To: <20220907071023.3838692-5-feng.tang@intel.com> From: Andrey Konovalov Date: Sun, 11 Sep 2022 01:12:05 +0200 Message-ID: Subject: Re: [PATCH v5 4/4] mm/slub: extend redzone check to extra allocated kmalloc space than requested To: Feng Tang Cc: Andrew Morton , Vlastimil Babka , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Dmitry Vyukov , Jonathan Corbet , Dave Hansen , Linux Memory Management List , LKML , kasan-dev Content-Type: text/plain; charset="UTF-8" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662851537; a=rsa-sha256; cv=none; b=Mm6BGmPTOuJWOUaCgKGZ6n4+NhOukKVOfnSKcoo/wn75SJryAYF4HqobIWmybrTcBOFPM6 WX/wAUUgpte4szkisN8M7BFw/QvZjTyHU5nJhDQmVRPpRjEgAztWotOEPBa2lVsduJETq/ mu158PfZvKlmIA8gFct68PwAf04dOQY= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=mwZQUBhT; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.222.178 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662851537; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=1qAOHyl0ZytUGK0LKmP2phdfOjsGHVNHqllONgN6fKY=; b=vUb7zjlkF4GL7RQ9fZ/Y6F+YYSMDxIYkMwgyxQBAZc8Nc7aHCU6w3NgIyaxRXVIBrTmJl/ LOZiVOxtqZR5StsJp3o1z4Bp0NqxXCPy8qlw+7QtKiK82aqvFw0+7oqATz5ulEFDcZw7ze dOeDVNUEnuAy9n4sQNfq/onfH8ixr3c= Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=mwZQUBhT; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of andreyknvl@gmail.com designates 209.85.222.178 as permitted sender) smtp.mailfrom=andreyknvl@gmail.com X-Rspam-User: X-Rspamd-Server: rspam10 X-Stat-Signature: gktymeexgoxe5wo7mwm6s4jatnu9zs6s X-Rspamd-Queue-Id: 6A3E2A00A6 X-HE-Tag: 1662851537-224409 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, Sep 7, 2022 at 9:11 AM Feng Tang wrote: > > kmalloc will round up the request size to a fixed size (mostly power > of 2), so there could be a extra space than what is requested, whose > size is the actual buffer size minus original request size. > > To better detect out of bound access or abuse of this space, add > redzone sanity check for it. > > And in current kernel, some kmalloc user already knows the existence > of the space and utilizes it after calling 'ksize()' to know the real > size of the allocated buffer. So we skip the sanity check for objects > which have been called with ksize(), as treating them as legitimate > users. > > Suggested-by: Vlastimil Babka > Signed-off-by: Feng Tang > --- > mm/slab.h | 4 ++++ > mm/slab_common.c | 4 ++++ > mm/slub.c | 57 +++++++++++++++++++++++++++++++++++++++++++++--- > 3 files changed, 62 insertions(+), 3 deletions(-) > > diff --git a/mm/slab.h b/mm/slab.h > index 20f9e2a9814f..0bc91b30b031 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -885,4 +885,8 @@ void __check_heap_object(const void *ptr, unsigned long n, > } > #endif > > +#ifdef CONFIG_SLUB_DEBUG > +void skip_orig_size_check(struct kmem_cache *s, const void *object); > +#endif > + > #endif /* MM_SLAB_H */ > diff --git a/mm/slab_common.c b/mm/slab_common.c > index 8e13e3aac53f..5106667d6adb 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -1001,6 +1001,10 @@ size_t __ksize(const void *object) > return folio_size(folio); > } > > +#ifdef CONFIG_SLUB_DEBUG > + skip_orig_size_check(folio_slab(folio)->slab_cache, object); > +#endif > + > return slab_ksize(folio_slab(folio)->slab_cache); > } > > diff --git a/mm/slub.c b/mm/slub.c > index f523601d3fcf..2f0302136604 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -812,12 +812,27 @@ static inline void set_orig_size(struct kmem_cache *s, > if (!slub_debug_orig_size(s)) > return; > > +#ifdef CONFIG_KASAN_GENERIC > + /* > + * KASAN could save its free meta data in the start part of object > + * area, so skip the redzone check if kasan's meta data size is > + * bigger enough to possibly overlap with kmalloc redzone > + */ > + if (s->kasan_info.free_meta_size_in_object * 2 >= s->object_size) Why is free_meta_size_in_object multiplied by 2? Looks cryptic, probably needs a comment. Thanks! > + orig_size = s->object_size; > +#endif > + > p += get_info_end(s); > p += sizeof(struct track) * 2; > > *(unsigned int *)p = orig_size; > } > > +void skip_orig_size_check(struct kmem_cache *s, const void *object) > +{ > + set_orig_size(s, (void *)object, s->object_size); > +} > + > static unsigned int get_orig_size(struct kmem_cache *s, void *object) > { > void *p = kasan_reset_tag(object); > @@ -949,13 +964,34 @@ static __printf(3, 4) void slab_err(struct kmem_cache *s, struct slab *slab, > static void init_object(struct kmem_cache *s, void *object, u8 val) > { > u8 *p = kasan_reset_tag(object); > + unsigned int orig_size = s->object_size; > > - if (s->flags & SLAB_RED_ZONE) > + if (s->flags & SLAB_RED_ZONE) { > memset(p - s->red_left_pad, val, s->red_left_pad); > > + if (slub_debug_orig_size(s) && val == SLUB_RED_ACTIVE) { > + unsigned int zone_start; > + > + orig_size = get_orig_size(s, object); > + zone_start = orig_size; > + > + if (!freeptr_outside_object(s)) > + zone_start = max_t(unsigned int, orig_size, > + s->offset + sizeof(void *)); > + > + /* > + * Redzone the extra allocated space by kmalloc > + * than requested. > + */ > + if (zone_start < s->object_size) > + memset(p + zone_start, val, > + s->object_size - zone_start); > + } > + } > + > if (s->flags & __OBJECT_POISON) { > - memset(p, POISON_FREE, s->object_size - 1); > - p[s->object_size - 1] = POISON_END; > + memset(p, POISON_FREE, orig_size - 1); > + p[orig_size - 1] = POISON_END; > } > > if (s->flags & SLAB_RED_ZONE) > @@ -1103,6 +1139,7 @@ static int check_object(struct kmem_cache *s, struct slab *slab, > { > u8 *p = object; > u8 *endobject = object + s->object_size; > + unsigned int orig_size; > > if (s->flags & SLAB_RED_ZONE) { > if (!check_bytes_and_report(s, slab, object, "Left Redzone", > @@ -1112,6 +1149,20 @@ static int check_object(struct kmem_cache *s, struct slab *slab, > if (!check_bytes_and_report(s, slab, object, "Right Redzone", > endobject, val, s->inuse - s->object_size)) > return 0; > + > + if (slub_debug_orig_size(s) && val == SLUB_RED_ACTIVE) { > + orig_size = get_orig_size(s, object); > + > + if (!freeptr_outside_object(s)) > + orig_size = max_t(unsigned int, orig_size, > + s->offset + sizeof(void *)); > + if (s->object_size > orig_size && > + !check_bytes_and_report(s, slab, object, > + "kmalloc Redzone", p + orig_size, > + val, s->object_size - orig_size)) { > + return 0; > + } > + } > } else { > if ((s->flags & SLAB_POISON) && s->object_size < s->inuse) { > check_bytes_and_report(s, slab, p, "Alignment padding", > -- > 2.34.1 > > -- > You received this message because you are subscribed to the Google Groups "kasan-dev" group. > To unsubscribe from this group and stop receiving emails from it, send an email to kasan-dev+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/kasan-dev/20220907071023.3838692-5-feng.tang%40intel.com.