From patchwork Fri Sep 21 15:13:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10610369 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BD1B15A4 for ; Fri, 21 Sep 2018 15:14:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD3BC2E46D for ; Fri, 21 Sep 2018 15:14:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A0EB82E4C4; Fri, 21 Sep 2018 15:14:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C9882E46D for ; Fri, 21 Sep 2018 15:14:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 58E988E0036; Fri, 21 Sep 2018 11:14:04 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 516298E0034; Fri, 21 Sep 2018 11:14:04 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 38FAC8E0036; Fri, 21 Sep 2018 11:14:04 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by kanga.kvack.org (Postfix) with ESMTP id CD1048E0034 for ; Fri, 21 Sep 2018 11:14:03 -0400 (EDT) Received: by mail-wr1-f71.google.com with SMTP id k96-v6so13060584wrc.3 for ; Fri, 21 Sep 2018 08:14:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=mjTJMND2InMYoPSUJVvHZluvejsOaOH9BQkiQvHv+tc=; b=smDw9VFWFUYbF7YVrc2wW/VW3yxpfJxEegyrIuwf9OWjIz8EsNXfOCYBnj4CoFXvSB LN5fDINdxV3l3/hZKXEmzEnSQYpdRBKI2mVjevhBfX3QK9gOGYrd+Smn4Dg4cGpwM6GJ B/v1cEYKdclWf5D1YX/tPKMIe7K6hySWnGyCqipGH+bi/soZLUDxtyWEc1/IUgKPODE7 EsE+VGEpgT9WDqJ4x6Od7PbWPgWs0pp5vzK9IKRTdwAHgCRmb8+g+3Y/jrlcqVdDAO/v SnTgH8WwTdL1g/tqQgQZDRA+DzLFxRuFHqyVVkN10pd4hWzOBfKdQbDG5NJ8wpX6h6fG hcpQ== X-Gm-Message-State: ABuFfogkRF5qpl+4e1GzMRhhc3L7/4Ign/jIxzJzkoe3fbp9NCp7TMIY 1o8Mzp1SKuRyUGpedf+9lusAc9o5vnEoIK1MKqk9PF/Q2qw/bZJwGgnrfUjLTzkMlfyRUmyWWf4 OTkggiaTmAR4EEXGThci14dRJzrib76n1d8Yy/IRosFL8edmaO5n7LAh4ZcT+B1apheKOhx0GV6 c/D1P4ks46iGZ0DQrngFPN34NzkWTpDrot149N4dQpDV0JH7hOdh16kcqxumXgU7m7mjD2BY5Mb hdeyXlTQRPc3iC8N/HqEdulH5tQfxJC4QmUjIPxbgspedPKtrLapiAFntfltnqXKFI8OuWY2uig D12IW76M29cJX+DsqAyORcqxp3Kr+ILRCdjlVqLK5rtmjQAbpWLm8mP+XhlHNuT8y0Td0e4ieyX 8 X-Received: by 2002:adf:f703:: with SMTP id r3-v6mr3613321wrp.85.1537542843361; Fri, 21 Sep 2018 08:14:03 -0700 (PDT) X-Received: by 2002:adf:f703:: with SMTP id r3-v6mr3613252wrp.85.1537542842521; Fri, 21 Sep 2018 08:14:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537542842; cv=none; d=google.com; s=arc-20160816; b=JW6O/5KLHiSmM0nWHEIoxDhSwl4Bw9BE59be3XRyg3TYrWkbz05hHWvz1gBubLEUqG UDDZrd9VoTvTZS1ke8qLb3SnbPDS/6PU0Ooyvkwcfg4amr7L/aojLxplxbeqiAOEtJME 5pzBUePYZuAh9KX3B7NTMsyXPBIMZjL5lIYlaUuvuNZdpk+lJ1Ld08/XuMJxGjNNUhJZ XStvkJp/k24Mm83nXk7RwWlydBu29WqAVZki6sj8OfjVFNIOr9LZclV9AMLfss8pWP2b WsuvZokrKg/rzdMXTx7tmxzN6GK4/foNF8V7b0dhTasZrr8IF2hp639yzonuLgqrljx9 nlrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=mjTJMND2InMYoPSUJVvHZluvejsOaOH9BQkiQvHv+tc=; b=abg0lnRPpJIAji7vdspNioTBjn6PkEZNRXohUhoTyMPkBrmNtT4XIztMGp0TG7E1wc VZL33EoUpWJBT8z7b7gZcoKPmZJDhW6bRt6F2oEEVm+uhvcbeh0WkLQOik5cArBADm3Y HI0JjYt9AdDZlNsnK1Q/st4+uBMewX/Khj28NAvZhWnKG1REaN5F1uPpFQuveKWBsxNi 9fI1dSfLgKOISR6zi6tqsq9ZTuuydyQ83RTe3LC6PIuexe7o7EKCxTj2OU6ux/GlchfS ym+vasFn6H8AtUBvNbRf1owIAmCH3zrTLkg8qTqqL1XYViVAxEDBY9pcO0AyCHJgaS83 TG1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=iP8uqVhJ; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id b13-v6sor20863032wrp.25.2018.09.21.08.14.02 for (Google Transport Security); Fri, 21 Sep 2018 08:14:02 -0700 (PDT) Received-SPF: pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=iP8uqVhJ; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mjTJMND2InMYoPSUJVvHZluvejsOaOH9BQkiQvHv+tc=; b=iP8uqVhJGEXg6tZRqMuU9Q7HePNsCduoH/q7Aw1X/zYOwPA0bolayCWyXePfTy7zJp vCrPFVZA3OfJblBv7fEQ5Wj64KRmCWAF1iMIV+qyobMXa/WsvTJOtSp+vFKnbrVbriEP 0KCjR1cLDCo3eHlhUpiVkjZaW+hlmNewj8FTFsjYGn63b0wWJdAePM2mBJR+xBnLO53q bmw++1JEHafERQZ7w/pyE3pv7akhaNozJHz/rBu1JHSvly1AqKW2UlHQqYmZHxPb+smO DZR1w1WqwZ7hm4SnzIEY1xcHQqixqSxPeEe5Djkg99PW60K6BMEknQmTgfoIbYPvrP05 XzkQ== X-Google-Smtp-Source: ANB0VdahIErwHyxu6qlRT7K4dJtmr7FgqGiVYl/UxD7i/B9elu+PCdd/MlOQK3vhfJ9Gyi/7uXOBSw== X-Received: by 2002:a5d:438d:: with SMTP id i13-v6mr39162425wrq.156.1537542842008; Fri, 21 Sep 2018 08:14:02 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id e7-v6sm27990271wru.46.2018.09.21.08.14.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Sep 2018 08:14:01 -0700 (PDT) From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Catalin Marinas , Will Deacon , Christoph Lameter , Andrew Morton , Mark Rutland , Nick Desaulniers , Marc Zyngier , Dave Martin , Ard Biesheuvel , "Eric W . Biederman" , Ingo Molnar , Paul Lawrence , Geert Uytterhoeven , Arnd Bergmann , "Kirill A . Shutemov" , Greg Kroah-Hartman , Kate Stewart , Mike Rapoport , kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sparse@vger.kernel.org, linux-mm@kvack.org, linux-kbuild@vger.kernel.org Cc: Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Jann Horn , Mark Brand , Chintan Pandya , Vishwath Mohan , Andrey Konovalov Subject: [PATCH v9 09/20] kasan: preassign tags to objects with ctors or SLAB_TYPESAFE_BY_RCU Date: Fri, 21 Sep 2018 17:13:31 +0200 Message-Id: <9ea379b38a763adeae0e43638a9769c96eea767f.1537542735.git.andreyknvl@google.com> X-Mailer: git-send-email 2.19.0.444.g18242da7ef-goog In-Reply-To: References: MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP An object constructor can initialize pointers within this objects based on the address of the object. Since the object address might be tagged, we need to assign a tag before calling constructor. The implemented approach is to assign tags to objects with constructors when a slab is allocated and call constructors once as usual. The downside is that such object would always have the same tag when it is reallocated, so we won't catch use-after-frees on it. Also pressign tags for objects from SLAB_TYPESAFE_BY_RCU caches, since they can be validy accessed after having been freed. Signed-off-by: Andrey Konovalov --- mm/slab.c | 2 +- mm/slub.c | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/mm/slab.c b/mm/slab.c index 6fdca9ec2ea4..fe0ddf08aa2c 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2574,7 +2574,7 @@ static void cache_init_objs(struct kmem_cache *cachep, for (i = 0; i < cachep->num; i++) { objp = index_to_obj(cachep, page, i); - kasan_init_slab_obj(cachep, objp); + objp = kasan_init_slab_obj(cachep, objp); /* constructor could break poison info */ if (DEBUG == 0 && cachep->ctor) { diff --git a/mm/slub.c b/mm/slub.c index c4d5f4442ff1..75fc76e42a1e 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1413,16 +1413,17 @@ static inline bool slab_free_freelist_hook(struct kmem_cache *s, #endif } -static void setup_object(struct kmem_cache *s, struct page *page, +static void *setup_object(struct kmem_cache *s, struct page *page, void *object) { setup_object_debug(s, page, object); - kasan_init_slab_obj(s, object); + object = kasan_init_slab_obj(s, object); if (unlikely(s->ctor)) { kasan_unpoison_object_data(s, object); s->ctor(object); kasan_poison_object_data(s, object); } + return object; } /* @@ -1530,16 +1531,16 @@ static bool shuffle_freelist(struct kmem_cache *s, struct page *page) /* First entry is used as the base of the freelist */ cur = next_freelist_entry(s, page, &pos, start, page_limit, freelist_count); + cur = setup_object(s, page, cur); page->freelist = cur; for (idx = 1; idx < page->objects; idx++) { - setup_object(s, page, cur); next = next_freelist_entry(s, page, &pos, start, page_limit, freelist_count); + next = setup_object(s, page, next); set_freepointer(s, cur, next); cur = next; } - setup_object(s, page, cur); set_freepointer(s, cur, NULL); return true; @@ -1561,7 +1562,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) struct page *page; struct kmem_cache_order_objects oo = s->oo; gfp_t alloc_gfp; - void *start, *p; + void *start, *p, *next; int idx, order; bool shuffle; @@ -1613,13 +1614,16 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) if (!shuffle) { for_each_object_idx(p, idx, s, start, page->objects) { - setup_object(s, page, p); - if (likely(idx < page->objects)) - set_freepointer(s, p, p + s->size); - else + if (likely(idx < page->objects)) { + next = p + s->size; + next = setup_object(s, page, next); + set_freepointer(s, p, next); + } else set_freepointer(s, p, NULL); } - page->freelist = fixup_red_left(s, start); + start = fixup_red_left(s, start); + start = setup_object(s, page, start); + page->freelist = start; } page->inuse = page->objects;