From patchwork Fri Sep 21 15:13:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10610365 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 D780114BD for ; Fri, 21 Sep 2018 15:14:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5C49289A2 for ; Fri, 21 Sep 2018 15:14:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B81FB2E46D; Fri, 21 Sep 2018 15:14:22 +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 1FFEE289A2 for ; Fri, 21 Sep 2018 15:14:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 086C88E0030; Fri, 21 Sep 2018 11:14:03 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 00CD68E0034; Fri, 21 Sep 2018 11:14:02 -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 DAA3E8E0030; Fri, 21 Sep 2018 11:14:02 -0400 (EDT) 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 75A728E0034 for ; Fri, 21 Sep 2018 11:14:02 -0400 (EDT) Received: by mail-wm1-f70.google.com with SMTP id r14-v6so2650570wmh.0 for ; Fri, 21 Sep 2018 08:14:02 -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=KVgtsbYbOvSjPEIUjVgdN3S6L/UK1zoaSGlGEjw8FgY=; b=D+YlaabWMLOu0AqCQErLkkHa9zjUG0afx1wzb1UE5HbdEZR8tmQ5hgr6KDI7q1GAPt /7umcKQ4CUqOZ6+UtWS9Ifyk78oHYK6Ic46lvV8E4ow/P0IEo9G+m+M4g7sHOOxNh3Rs B/jGOZjconzGkl8iF7mE3sWE0wQdUitObvWzZ393ot/u5v2Xk5NN5dWHFmKusSk0GNMC nH5lHoGuq9vsV9DI0v8/ymBAYP34n3hLG3vKnKIU9e2vpN622U9qHtZqlLKD1DcUGDKI OYhDIQNODd/YSzvkq/ZuWmYiEM8CvX8uOWc6+m9d41jwNGnObnf6i1m+gLRBhkU/z8F1 bveA== X-Gm-Message-State: APzg51CLvc+2T++qkT9m2XthfjvZSNWe+4S9+ude0kG+Ww2WJ+LLugEl rgoHYOP6nfg2WMPaGnOuywlLQRgQwKPUagQ7GIMSJAkDEg1jH6vzUWmoD7kvtANluRtU3xWtqof GElDKYrWjjioqh4rHH2EYfW5qh7Zygt5yHoX3kt2iNqj32vIVs0WV9/JNpXWYj4v+VBT/u7HF83 qPxxjIHfAt3GVW2YFX0iYGB9+FBsxpbEDnA5+er891teAW/AL4iodDPLjb3tC/VR6vkIpwFknDx hSvbIzBmMf6hwVHqXko5JYxugLkfbgzh5nX0vM3uokWB1ICbzpAADUsGEEHGKVmUzpce5a2+WMg DJnpZgBwGEG5oK2ak46sYbuby1gGj54pnPh7akPWkRySRsKZ2n+qF6mBn0TnPGutS4T5DvHUO+2 W X-Received: by 2002:a1c:adca:: with SMTP id w193-v6mr8007796wme.147.1537542841905; Fri, 21 Sep 2018 08:14:01 -0700 (PDT) X-Received: by 2002:a1c:adca:: with SMTP id w193-v6mr8007711wme.147.1537542840897; Fri, 21 Sep 2018 08:14:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537542840; cv=none; d=google.com; s=arc-20160816; b=wvLY+MtGReFIhDeS3qaxz0gKWfU5e7qSqzeBPkGHFnqSb4SGczKRDHYkF4wPRJhE4r qvQDp7UcArFG04kMi0DM/IWXg8AYkU5DcY3I7wMVWejiuONyiOlZyfjlJ78Z72O5TxR6 UD4Xf8i1xp6ohOGVTbPziR0vdlikCBCcVRCJ51R6eo1jJFGRrJGJqotGdjqcemKRXuvx B/dqv69e2Z0Z31JJEepO05q1Dv9yqny/CDR3VD9FliWLV+ctweg1z7RdQBjArj0AUZkU LIm5RstLi3EF9Wq6nMUoacp+e5ZnCGVRoplDIc0BDl8q5kfvAMICoRaARgNLRV5MVe/A ty5A== 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=KVgtsbYbOvSjPEIUjVgdN3S6L/UK1zoaSGlGEjw8FgY=; b=dWgP1095GpUPJ7FIIZHASlGAcS66XYxPFrRAFRznRTuts/xyjdtpj9oWvBBASeg4+J aetNHcfLUUx4VFLleuT97VJg1f2I69wDNNaEyx3hBvhnKpduiGEKnGQaRbnl1GcR9z75 r/HtEf/PQ7NmWagM2SDCLpQh1gwQxwZAnE3HJcmBIZUKypMWjFKzSTf3qlXzRxTF085d /t+Zs4f+QR/gJPxqaD1gvMRvasG9R5zBzU8QTKJZWfrN7GY+jbFP04RyCM5GnRS7P3nm KuMXnPO2CH8uYSpHRCukboIeYHtpIDQh/DgFNldhXbuTRASWT6P52RkloVgzf4it9GsI WmGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=UVkz6KYM; 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 w14-v6sor20490736wrr.11.2018.09.21.08.14.00 for (Google Transport Security); Fri, 21 Sep 2018 08:14:00 -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=UVkz6KYM; 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=KVgtsbYbOvSjPEIUjVgdN3S6L/UK1zoaSGlGEjw8FgY=; b=UVkz6KYMs1jt6BNhhHjCnPFd4+RJOvztwmajx7c1R34dBVPpZdcX1KOPK8VUDzdGjD I19WjqNH+Az78D2uPI2wWpTdoBPn+/YzwHu6ZDUQQ3t3rXw4pg/sEMMGv2T47ALQ70V2 XtzbKNv7LbJ9SIQL2qhBimllGqf0KW/C+/83JZJkiVcYOZMNFStl0BtrUuIdqvUIrD/g SHKFAx+nm5L8Vyb694Jt6hzSMO4tNja18/aGZebA7xQk9H4JAj37d89p43Xird77eTHT qriKa1do9sZKhWy+Kv0xEOWAz9/StLdiFG5qH3z7vGorbrPzOsc5F/+xNS+669Q+VFKd e0Tg== X-Google-Smtp-Source: ANB0VdY9DhoHxOj8lVeZe6dprtekKU7u8Y5gEjmNrsoZiG6uhCvRL6CiJbT48sjsEaIZfB8CzJQ/kQ== X-Received: by 2002:a05:6000:108:: with SMTP id o8mr36830902wrx.196.1537542840292; Fri, 21 Sep 2018 08:14:00 -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.13.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Sep 2018 08:13:59 -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 08/20] kasan: add tag related helper functions Date: Fri, 21 Sep 2018 17:13:30 +0200 Message-Id: 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 This commit adds a few helper functions, that are meant to be used to work with tags embedded in the top byte of kernel pointers: to set, to get or to reset (set to 0xff) the top byte. Signed-off-by: Andrey Konovalov --- arch/arm64/mm/kasan_init.c | 2 ++ include/linux/kasan.h | 13 +++++++++ mm/kasan/kasan.h | 55 ++++++++++++++++++++++++++++++++++++++ mm/kasan/tags.c | 37 +++++++++++++++++++++++++ 4 files changed, 107 insertions(+) diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index 7a31e8ccbad2..ecd3f25cc323 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -250,6 +250,8 @@ void __init kasan_init(void) memset(kasan_zero_page, KASAN_SHADOW_INIT, PAGE_SIZE); cpu_replace_ttbr1(lm_alias(swapper_pg_dir)); + kasan_init_tags(); + /* At this point kasan is fully initialized. Enable error messages */ init_task.kasan_depth = 0; pr_info("KernelAddressSanitizer initialized\n"); diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 7f6574c35c62..4c9d6f9029f2 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -169,6 +169,19 @@ static inline void kasan_cache_shutdown(struct kmem_cache *cache) {} #define KASAN_SHADOW_INIT 0xFF +void kasan_init_tags(void); + +void *kasan_reset_tag(const void *addr); + +#else /* CONFIG_KASAN_SW_TAGS */ + +static inline void kasan_init_tags(void) { } + +static inline void *kasan_reset_tag(const void *addr) +{ + return (void *)addr; +} + #endif /* CONFIG_KASAN_SW_TAGS */ #endif /* LINUX_KASAN_H */ diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 19b950eaccff..f16bee55b610 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -8,6 +8,10 @@ #define KASAN_SHADOW_SCALE_SIZE (1UL << KASAN_SHADOW_SCALE_SHIFT) #define KASAN_SHADOW_MASK (KASAN_SHADOW_SCALE_SIZE - 1) +#define KASAN_TAG_KERNEL 0xFF /* native kernel pointers tag */ +#define KASAN_TAG_INVALID 0xFE /* inaccessible memory tag */ +#define KASAN_TAG_MAX 0xFD /* maximum value for random tags */ + #define KASAN_FREE_PAGE 0xFF /* page was freed */ #define KASAN_PAGE_REDZONE 0xFE /* redzone for kmalloc_large allocations */ #define KASAN_KMALLOC_REDZONE 0xFC /* redzone inside slub object */ @@ -126,6 +130,57 @@ static inline void quarantine_reduce(void) { } static inline void quarantine_remove_cache(struct kmem_cache *cache) { } #endif +#ifdef CONFIG_KASAN_SW_TAGS + +#define KASAN_PTR_TAG_SHIFT 56 +#define KASAN_PTR_TAG_MASK (0xFFUL << KASAN_PTR_TAG_SHIFT) + +u8 random_tag(void); + +static inline void *set_tag(const void *addr, u8 tag) +{ + u64 a = (u64)addr; + + a &= ~KASAN_PTR_TAG_MASK; + a |= ((u64)tag << KASAN_PTR_TAG_SHIFT); + + return (void *)a; +} + +static inline u8 get_tag(const void *addr) +{ + return (u8)((u64)addr >> KASAN_PTR_TAG_SHIFT); +} + +static inline void *reset_tag(const void *addr) +{ + return set_tag(addr, KASAN_TAG_KERNEL); +} + +#else /* CONFIG_KASAN_SW_TAGS */ + +static inline u8 random_tag(void) +{ + return 0; +} + +static inline void *set_tag(const void *addr, u8 tag) +{ + return (void *)addr; +} + +static inline u8 get_tag(const void *addr) +{ + return 0; +} + +static inline void *reset_tag(const void *addr) +{ + return (void *)addr; +} + +#endif /* CONFIG_KASAN_SW_TAGS */ + /* * Exported functions for interfaces called from assembly or from generated * code. Declarations here to avoid warning about missing declarations. diff --git a/mm/kasan/tags.c b/mm/kasan/tags.c index 04194923c543..700323946867 100644 --- a/mm/kasan/tags.c +++ b/mm/kasan/tags.c @@ -38,6 +38,43 @@ #include "kasan.h" #include "../slab.h" +static DEFINE_PER_CPU(u32, prng_state); + +void kasan_init_tags(void) +{ + int cpu; + + for_each_possible_cpu(cpu) + per_cpu(prng_state, cpu) = get_random_u32(); +} + +/* + * If a preemption happens between this_cpu_read and this_cpu_write, the only + * side effect is that we'll give a few allocated in different contexts objects + * the same tag. Since tag-based KASAN is meant to be used a probabilistic + * bug-detection debug feature, this doesn’t have significant negative impact. + * + * Ideally the tags use strong randomness to prevent any attempts to predict + * them during explicit exploit attempts. But strong randomness is expensive, + * and we did an intentional trade-off to use a PRNG. This non-atomic RMW + * sequence has in fact positive effect, since interrupts that randomly skew + * PRNG at unpredictable points do only good. + */ +u8 random_tag(void) +{ + u32 state = this_cpu_read(prng_state); + + state = 1664525 * state + 1013904223; + this_cpu_write(prng_state, state); + + return (u8)(state % (KASAN_TAG_MAX + 1)); +} + +void *kasan_reset_tag(const void *addr) +{ + return reset_tag(addr); +} + void check_memory_region(unsigned long addr, size_t size, bool write, unsigned long ret_ip) {