From patchwork Tue Nov 27 16:55: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: 10700945 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 2653A14E2 for ; Tue, 27 Nov 2018 16:56:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11C182C4B0 for ; Tue, 27 Nov 2018 16:56:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 055E72C4D3; Tue, 27 Nov 2018 16:56:45 +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 6D73C2C4C4 for ; Tue, 27 Nov 2018 16:56:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 516976B494B; Tue, 27 Nov 2018 11:56:13 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 474F16B494D; Tue, 27 Nov 2018 11:56:13 -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 2EF3C6B494E; Tue, 27 Nov 2018 11:56:13 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by kanga.kvack.org (Postfix) with ESMTP id C790C6B494B for ; Tue, 27 Nov 2018 11:56:12 -0500 (EST) Received: by mail-wm1-f72.google.com with SMTP id 132so16889996wms.3 for ; Tue, 27 Nov 2018 08:56:12 -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=4s2WHY6CF+7V+5ETRMCx8aRRLenfz3ucdYpRRnO2KsM=; b=rBnqLbCwAG7wdE5105kYIHfIrZW2W1PG+eBPTl/WaSd9VUkpiX4OETmD7qu54YlYwa w8LfbboA7xArHu4uahvx9a8aPiZdRbRHVvYYhsVR1aOqjAipLGAT3tztkNyCWbxYVePR MIFV0l0SAn3PYTxiyhMzt0tomctF+i7z2p8oMOCZuaycYJA2M1fVRqq7CQxi1QhDTCJd jSw2zdDadD0te2s0RawMyNYhGH0o7jLLKT+xPvBU3H2PW9c5pyRwM5cPX4wBM7qF2A74 ry3xuCErpVeEN1UfzRM2L/kk6LgssfZL77mLSEMYMGDoMwa0YBXNKVsDQia89j1GMRqs Jw5A== X-Gm-Message-State: AA+aEWZvLqf/wHJAyRDBHzh2Pk5QZf912RWvIj8A6virLDs4qYaBNnUR sjCVMS2ro3mfpGFmLiWuUtc1NCeABieKEgecrcAyHSIjOykzAkk2mhPnXVwf/lA6WdH3Tn3imcY MybrNXXsNEyB/ppSIAGroSwa0TzzZg//ByIVd2qOa0k+509439hvbChn9KW/qIXnhpdzZoCgEoV /NH65UMPVbdwYDSMPJphEmSTGXKl+uk2R8hxGzE4vnnZCa1WbZwr6+1enXsG8resCbQsmEEet5z S/czjD9JsMVo45NaFIG0bkzeGQqIaMhsrDjja1wbe1WaANJVHB56MsR+uQ+ZW8/xVA+ilTGgA1I /zHrwHwiWjjGZSHK3CVtNAtWvRzfg6dRY2pmX/o9NHMLMA/HC/hkMWT7xdFrzL0QvqdAwmFdAEL h X-Received: by 2002:adf:ebd0:: with SMTP id v16mr22661751wrn.109.1543337772325; Tue, 27 Nov 2018 08:56:12 -0800 (PST) X-Received: by 2002:adf:ebd0:: with SMTP id v16mr22661694wrn.109.1543337771369; Tue, 27 Nov 2018 08:56:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543337771; cv=none; d=google.com; s=arc-20160816; b=Oc9sYiquvujn1F89JXgo1DxQD/qfo46zBbTvqNL2iBOByxutcqDHA3Xl5HpPRsvyV1 5DxI2NJMqYCVOp2IwybnP1JdnYIWt2tinAbv03zbJVPuyUOes7yJYa+rlINxoTqvcJZY V7GRaXQD0wTApVYQ6JppuwHCp6LZLbiQL6S/H3SvUs8+kcJxheUkpKOXgmeuZx/EPv3o 64sxoR1iqPoc1eNwaVjynyqjGA8byXPDhyoJjJ6xuJJs32cdKoqLYE5Hbz24DlDGg3JE u/k65tEUDE9JUClKg49OWKav5CQclfMSx+lT36cRBVkaXtzpPiW0vSLHdEXTV4Lnmo0x hAHQ== 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=4s2WHY6CF+7V+5ETRMCx8aRRLenfz3ucdYpRRnO2KsM=; b=BSw6tx3SMXCONeGBMVZJg1c5Ey3UXfPtRDr5gfRteaUyFV9gr2Xhs5Y/8KRh9so0yM tK0B72Jg07EAcdQ5bdAMI4MvNuD0kJWDOLpaO4+9OpgOJXdRkxlDRu8f2oIAPy1hF2mm ubMobDtywd2cxKgx3+EHuuxKGnaaXLmx377yLZfjZG1qTXgFNqNgNeieSaWbXzwFISKL wiRbqmmVOjPBYA+7Tktv2d4hjzVLibTA8O/Bmi6H8ay8LqxfV58GPN3GMA+Jkg/kJF/f XR0kKbRLOnWtjGooXzTHLNFmEaCGRxhUoCldJKUTgGCBOJZd++MxPFi/GyNBNMFgBz9E cG6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=ie7jabn+; 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 m65sor3338436wmb.22.2018.11.27.08.56.11 for (Google Transport Security); Tue, 27 Nov 2018 08:56:11 -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=ie7jabn+; 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=4s2WHY6CF+7V+5ETRMCx8aRRLenfz3ucdYpRRnO2KsM=; b=ie7jabn+eKGrSyU6M1ZrcJxSWuT6cq77fF2R9lUfLQIi8Gr2qJk90uP4rQdAwYc3i/ BzkjjICxP9uNZ2wir+A+L1ko8NYWBwSA37ftS+H+Bmn3ZEcr0DAJupJUdUY++MRLSAdl GOVXtJSg0ysWC871IXVicxLiL+ZxjqXjJddmGFKHXYIAtsZ7/5tihtIoxdg6u6JDgmWg FWO4vo+zhbRqj0ebJBVKVL16OatDIs8Xy4oot9zqeDWTgMoQmiHv5WqJrpGree3Dobsg ZoTJ2eZeqDWXjB9kJf7uYraVLaqZSZs9L3pdZCmNeVa6ZGWdIaxsoEQbVKRvWxEIoCoN EziA== X-Google-Smtp-Source: AJdET5conMtQ/SqFrfQKf7PVc7uFAQ/al26Ds5DRdODjlyFRzE6MxacgkfMsqlhDuH9BpluipOVEOw== X-Received: by 2002:a1c:2304:: with SMTP id j4mr27714121wmj.14.1543337770742; Tue, 27 Nov 2018 08:56:10 -0800 (PST) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:3180:41f8:3010:ff61]) by smtp.gmail.com with ESMTPSA id k73sm6383099wmd.36.2018.11.27.08.56.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Nov 2018 08:56:09 -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 v12 12/25] kasan: preassign tags to objects with ctors or SLAB_TYPESAFE_BY_RCU Date: Tue, 27 Nov 2018 17:55:30 +0100 Message-Id: X-Mailer: git-send-email 2.20.0.rc0.387.gc7a69e6b6c-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;