From patchwork Tue Nov 6 17:30:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10670937 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 445C813BF for ; Tue, 6 Nov 2018 17:31:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F0892ABA2 for ; Tue, 6 Nov 2018 17:31:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C5D22ABC1; Tue, 6 Nov 2018 17:31:18 +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 954352ABB0 for ; Tue, 6 Nov 2018 17:31:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1D39D6B035C; Tue, 6 Nov 2018 12:30:59 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1ACCF6B035D; Tue, 6 Nov 2018 12:30:59 -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 F41446B035E; Tue, 6 Nov 2018 12:30:58 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by kanga.kvack.org (Postfix) with ESMTP id 99FE76B035C for ; Tue, 6 Nov 2018 12:30:58 -0500 (EST) Received: by mail-wr1-f69.google.com with SMTP id n14-v6so279345wrv.14 for ; Tue, 06 Nov 2018 09:30:58 -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=O1vMMTGgXT5THnLF0kAS8Fu/LaAMqGXOrnmJN3ed1dI=; b=hpULYdsLfe6MZKy+tr4C3qlYDG3ss3QLsfC90qsCLaUorGpQwbiSOOHYFSdrWTRRhA Y1wf7GOI2NrBz/cMaxNqzaTXid01gxN3dMNBud/lPCb0hGzArBOdvE4DXr1w7s/SbQZ1 qDPrFx1EoskyIyurH14IBXvV8AdNLYZYtM/oGqlAp3fwdRWuyY7DXOjyHFkvKrgJ3INl tit7Gxp4/Y1yO/Ly3TmaDpa0bG2H/uun5MplpezxxQjRvaGO3O91atmW5qgcRSorJIV0 9gNUaDwUPT8iqiBbLjDRY6Tn5lAUN4qCFvKOZXiWQhdLb4OmyxodKdZaPPAeiAmsqGpa BSFQ== X-Gm-Message-State: AGRZ1gJbUPqxQMeUfBtqPO8z+yh42fJe/6RJ/XX3lyJ2SST3mTXyPI37 vJ//5xr/ERTuebfgMwsOXSy37XtVUErRtH7g1mllIC2gUGMjysd/dUPMCMS+k7dt9Uuk6Pd96yd RpR3pm1IAArXJ9fjTKtAjlMt38MUyR7UgNiPc6Of9bFkMTcvrGcd87NI1EkaBpDigY3tzjRyT2m lhIUxOdr6IzieJAtx/eIEMG1wxX8lWWd89iWPfxJf5VEymx+IKus9zC7oW+y6BJnJMdTClUXAQx qDecj6fRwDtJY54lZLZuCiIZMZyjqFgKQtLVcP1r48AjabNG87h1ZcDFRTQTGfrxW1j+XLM9vpp gfRGO4RchIHcNNQQ4R8Rny+VMzlKueeWo6d9X6cs/obd4Ldf84VCyXBdbhdN8MHJ/GcuTanxLAn a X-Received: by 2002:adf:ea82:: with SMTP id s2-v6mr16617936wrm.180.1541525458144; Tue, 06 Nov 2018 09:30:58 -0800 (PST) X-Received: by 2002:adf:ea82:: with SMTP id s2-v6mr16617878wrm.180.1541525457049; Tue, 06 Nov 2018 09:30:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541525457; cv=none; d=google.com; s=arc-20160816; b=VIwt+yTIGCCw9mhUweCXGzuFuP3N+EualXjMOqtZfSRmBORR7DjJ2QSd9v92S0LUAN z1QfqD21WKRi6dyTnrnbCh1+PgAz+njlIb4CrmZB5imk4G1AqwwTeFmUQl0L8aiSeAtA bpaIEBcfXdsyG/DJYd7DDl1g5R7qNqqlacaR2MbWUaVgOPJos5kRdwlGIt3LbFU1W8kU T5MZmBHp6vhPktPUKHXzhdiCx/cktASsw1lC3zrg/TgVOX/i6MZN6t8UgCqL4Q2Pme+5 nAbOmMDN0idVXGjBfdROw77qvMv0dzysHPEVVtJosjCAX1pM7oCbE76irtcyHCgofFup x8fA== 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=O1vMMTGgXT5THnLF0kAS8Fu/LaAMqGXOrnmJN3ed1dI=; b=cRO2hw7E9ZNSWdtVAVAwrdpRwh7ToR9k3Ya6wU7KL5I7KfyOpF74xfCYHp80aGWjdD 8qWMDdTF8dXsGPH1YkW3Dl1VY1mckyxJbbGH+CY7HnOF/TEWXssNmM1iMDkI6JktkCsF 1Nu/qUV4vmTZCdmvtFVn1qAvxUXLp46xI7oqk0oRZqblOZ+pJnqLhfy1IdOLOslLm4ee ayCQOaio3cbOkK35Uh0rQbdVQReG3HFEyNYPfwwB6z2y1O/Ql9/hefw5rO9how+zNtze fih05udGW3JYiPud8rNw9jH/JBBvFie0GKTQwzdff5cGVreSmdXg0nfZqONEWfxDRIVt lOtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=JU9c3Lh5; 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 w7-v6sor4540602wrn.19.2018.11.06.09.30.56 for (Google Transport Security); Tue, 06 Nov 2018 09:30:57 -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=JU9c3Lh5; 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=O1vMMTGgXT5THnLF0kAS8Fu/LaAMqGXOrnmJN3ed1dI=; b=JU9c3Lh5W2wYLQLUGxv+kevVq4L9hn60DTsEYc25P4TeQg+ERcQx2FYrqNFAvEfwbe jqgqDdrR6kuCTDLQ4eWuEQP+DuGe18bR9H3mFPicPIZIOdHQa243yR+g7tRmvCh34XWL u7pHrogECFVqcjMlrB8JlJdq4BoPgjg8+zgcnSMtYkJ4aiTkDac6/UZheFcBy37thRON ii20clEmzr0bTQCUTZyhEib9HP1cOak0Iue3dVihlXHzPci5dFagib7AZS1yImZOR9XA 4/jLQ3Jh/ADBzJEbzF33Ocf39QDTIZBR9QL5ffaIOOlVIESWjJj3WRlpXmCTtsgoJPAC aWtg== X-Google-Smtp-Source: AJdET5fvpmqGThFn+TWNzkerNUYwlOHmwCZNa3bl6LBLNUt6/mMfc5adpzrhtoxCTLMvuK3yymuxVA== X-Received: by 2002:adf:8b0a:: with SMTP id n10-v6mr22592268wra.282.1541525456128; Tue, 06 Nov 2018 09:30:56 -0800 (PST) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id z17-v6sm16328416wrm.65.2018.11.06.09.30.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Nov 2018 09:30:55 -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 v10 09/22] kasan: add tag related helper functions Date: Tue, 6 Nov 2018 18:30:24 +0100 Message-Id: X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-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. Reviewed-by: Andrey Ryabinin Reviewed-by: Dmitry Vyukov 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 18ebc8994a7b..370b19d0e2fb 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -249,6 +249,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) {