From patchwork Thu Dec 6 12:24:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10715773 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 DF7FF1731 for ; Thu, 6 Dec 2018 12:25:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE123292C8 for ; Thu, 6 Dec 2018 12:25:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C1C542D325; Thu, 6 Dec 2018 12:25:30 +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=unavailable 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 49F8F292C8 for ; Thu, 6 Dec 2018 12:25:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 718146B7A07; Thu, 6 Dec 2018 07:25:10 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6C7E26B7A09; Thu, 6 Dec 2018 07:25:10 -0500 (EST) 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 5430F6B7A0A; Thu, 6 Dec 2018 07:25:10 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by kanga.kvack.org (Postfix) with ESMTP id EFED56B7A07 for ; Thu, 6 Dec 2018 07:25:09 -0500 (EST) Received: by mail-wm1-f70.google.com with SMTP id t77so211922wmt.5 for ; Thu, 06 Dec 2018 04:25:09 -0800 (PST) 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=sISq/ZW0TVJBTVtL8WDFsSQvFMzwvGrKZuo3jHEW0rs=; b=qcNDRpo1YB9DmJmvy/VfqMOigO6ZD4fWh/1YfCIj8gqph2weS5SU93LL/ZFdQ0v3Ow tM/HEgK4O4E8S5Ql5HXOs+o9tJKZABw1RjEYtiVcETn8xjI8Hu/xj94IRo1cDHKhDJY3 xl1wuhn9Lx4z9RgCwA3vjCZ0YzYqArrj2b3RGvszX1B2raMRMr31akrxhcJBIFsALfPe +YiF2pB8DNkOK8ptXKSVqHCb5HFqhviyWK9dgmhGR7xA7cl+Be8SbudKJXeWLmUDuErO JkmR9sDBz0R9i4tRpEDB59Z4BKMAE3Tk1wmbENGEJK+BdBdzQ0G6ci3UmbgtgcpuC7RT YIOg== X-Gm-Message-State: AA+aEWYmUVfT4ZRffWdj/AM8pEC+e2d6N8sCyIK1vurMIk2p7faEc2t4 VRGDZllI+ErFdkadKnPIzvwyypCC18JAiMShxwiVpRoXwhfIfgWLxrCGin1gzfCg/BWbwXRqGXr er8ChXtbiOTd1COl8q2V9ycPJN+Ep7yJiDVf0bTHLWs3oW9/SMcV4JVxijcTze9cVlM16LhLCVf cwjuPwZMtakw/iGorOXup0CSx1zrATES0TNlOxebfplpCCM+m31pxkUA3zheCTVJqM+qsx2Ejj5 +QqRS4Kodz4MkGYfnmUQdmdhiHNgWZXnyBaet5jZb5vDQrJWd45z7stOZlSVclyOkoP4Xjp5vY/ gVTskGCM60Z1F7NKJSw4KenfZLgpeStc4TJT0mdx07hEavXyeqZVv/gMmIfssAhCJKcgpjZlRoF 7 X-Received: by 2002:a1c:770c:: with SMTP id t12mr19713355wmi.101.1544099109484; Thu, 06 Dec 2018 04:25:09 -0800 (PST) X-Received: by 2002:a1c:770c:: with SMTP id t12mr19713299wmi.101.1544099108533; Thu, 06 Dec 2018 04:25:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544099108; cv=none; d=google.com; s=arc-20160816; b=YULJVbWX4d6Duw21d/N0oUwwb/YOTjnkQphoWj8n5V6sVMU6U0XTbfhegkrke7MQjJ YDkvtxa8xIGOWData9qE6fmRuCtR6NNkTD7eajsjJVtucXLYE8H6Y8CQZ4BJ+G+ShwuL uxYUrgGT/btdHlLxfpRPqVSOvRWKcgPJt3ANu1ii3TKm7d1Q2cHm2B6NVFmmdTw0/LxR 2nDyt9MOpdKytSSg4egdjylFLui6ZtREzeHV+6BkYBEpr0qQCvr0ansaIzelzZd3Hyg8 sSJ+qhNjyHg4/7+J8sYoRaYMpFtZjhJDbBePqnQwmFNkct0b028AhLZOABTfGvDa7RDX c6pg== 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=sISq/ZW0TVJBTVtL8WDFsSQvFMzwvGrKZuo3jHEW0rs=; b=ft+xL/5yEuJWRGb0Qi6yHq2mG+j4qkngnFQuWz3xKu7CTEDH/EKEsj64QZUEgRCtYt 7K9xQ2LvAXNoEwjO9xour/UTiaCx62byyfCOtj9BUKYqRJ9ksQWxjmJK04jKrxQY7R1h c7464kaecXGEgwVhkIYCR0P0lJn/l9q68maa1uLeInaGLFNQfE2A1GDWbAYSXjaOIuZd xKNyOsfgTrhmyahapehqmS9GhGDFbITTew/s27dTmhv4EFBGoCvE5GifOEwQvF4yivlG eN9fUvEuL2+IAIlTNnNiOwcUoN9vuHLoZRvz8sCwUdvW8lRRkBFek6lyBVvpsWi8nuo1 VOWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=EIaG8FbV; 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 i13sor447490wmb.11.2018.12.06.04.25.08 for (Google Transport Security); Thu, 06 Dec 2018 04:25:08 -0800 (PST) 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=EIaG8FbV; 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=sISq/ZW0TVJBTVtL8WDFsSQvFMzwvGrKZuo3jHEW0rs=; b=EIaG8FbVvjfEZBwPVnSoxYhmFaPSG+vHC9ub8Q9UvflzLci7qWq1MIvHhHMYHp+qDe aYCb2A46h0HyozZYwd+MH09I2ZtN17SqYJSvjpXS3OWlMZyrAYkp8oRdU0Rvsn1ii2PH hgxdrby1RcW8uBjfYxUDDMAMeg/GAfy+QZp72weuTc9DFFG8WxesnWT3ce5AlEqG1XPu NUxxu1xI3NGg4i+djtH88GpUdqSqviOaUnu2vrK/1hHU/TEC5YZsyp6TnaTdAvOQTaUe zkHqUUKT1p1wYmKjUILEhMirxb9nhAqh+8GNSNz+rwKkyZke8WRAAJA6DaJN86coRzJI SjIA== X-Google-Smtp-Source: AFSGD/Uvku6Y8UP5YFct8xBdwbQSBOubcGBRJqYe7H9p2WfZHwE/gOIPH+PVv5TfLbG/g+zd551lTw== X-Received: by 2002:a1c:e088:: with SMTP id x130mr18266740wmg.23.1544099108033; Thu, 06 Dec 2018 04:25:08 -0800 (PST) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:3180:41f8:3010:ff61]) by smtp.gmail.com with ESMTPSA id j8sm339988wrt.40.2018.12.06.04.25.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 04:25:07 -0800 (PST) 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 v13 12/25] kasan: preassign tags to objects with ctors or SLAB_TYPESAFE_BY_RCU Date: Thu, 6 Dec 2018 13:24:30 +0100 Message-Id: X-Mailer: git-send-email 2.20.0.rc1.387.gf8505762e3-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. Reviewed-by: Andrey Ryabinin Reviewed-by: Dmitry Vyukov 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 26f60a22e5e0..27859fb39889 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 e739d46600b9..08740c3f3745 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1451,16 +1451,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; } /* @@ -1568,16 +1569,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; @@ -1599,7 +1600,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; @@ -1651,13 +1652,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;