From patchwork Thu Sep 15 15:04:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 12977558 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0678ECAAA1 for ; Thu, 15 Sep 2022 15:06:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 516288D000E; Thu, 15 Sep 2022 11:06:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4ECDA8D0001; Thu, 15 Sep 2022 11:06:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 366A38D000E; Thu, 15 Sep 2022 11:06:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 28A038D0001 for ; Thu, 15 Sep 2022 11:06:30 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 03F2A1206E3 for ; Thu, 15 Sep 2022 15:06:29 +0000 (UTC) X-FDA: 79914646140.08.3969D07 Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.73]) by imf15.hostedemail.com (Postfix) with ESMTP id 52FD6A00B4 for ; Thu, 15 Sep 2022 15:06:29 +0000 (UTC) Received: by mail-ed1-f73.google.com with SMTP id y1-20020a056402358100b00451b144e23eso9389505edc.18 for ; Thu, 15 Sep 2022 08:06:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=S+kwzH5LfDyg6tc+T47KWRR4zTWxpHjqyuN2TRvGEwc=; b=ikiVkwTWTLFg9q22Qo4MSxlAf8PXtNYS/YYj3pii7FEhNeb9uHoJOl8elk4rPV4ZJZ 0IGJinTNDSDUCJXFLmtqtctlrBSMtSZx+Q27jQ5t/D4KUgh+E+9+KwPOr2K16xHCw6ZT stactk3FWOzjDq3XEnZtyX+gYnhHfZkZCmjyOGFqc6N3weiBgsHifRSIeQhCUvV5vZJX CG1yQ4Azvcw+Azu27dzh37E/xbi/PjeAK04sk085Qwwj7CDPFh4bJbybx/ZYZq8xM1DR 9LGd3d+74k/4QZbbzCwxMuDFLSZDOavjAjoH2kSQnr509kCCEUIdA8blYvLSclZ5hJ2P x2mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=S+kwzH5LfDyg6tc+T47KWRR4zTWxpHjqyuN2TRvGEwc=; b=nIie8zkgkl8ave/w7a2Ssb1EgrwHfge8kTE/PeJkN90NruQcynYEURI3J5TYCVNujB MOQQ5sxzGUcQ0G52QEnfsJxLFJQ2qcC0QWvbGuLx4WsCZRCBTRksAPJ0y8RKpCfBWh6s YM3KFCpz06K/Qm6s7YYa/B/B/H73Qxv3HoRkTN3MEmrb6vGaw03k1XNtWaVgac1sVlNn JIHcEvyJ0/FhtmtkkLcqFq1FyAk5GnFtprEF4mtCQaTjOUqV0uggYByO52Nbgzt8WqMh LOBH/zZOHTtV4LdGgM6nr/y0Ximk5FCuZUtr3Q5QW9PHYVOp8nSdwr78cSYFwas9LJld 7GGA== X-Gm-Message-State: ACrzQf1ds4uswTLQ0cdc6lUuviik4kOI7cyGrNkCSG8SyXkacFcUHwZt ULIFXliRCMDopNAyWN5rapVa1irqcZQ= X-Google-Smtp-Source: AMsMyM7sbunNpO+CpqIWn/hftkFrFIDp3ih3TnneGFODdNEkk+fy3fgyPU94i649AG9zEEjpdPfVfIIHuAw= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:686d:27b5:495:85b7]) (user=glider job=sendgmr) by 2002:a17:906:5a5a:b0:770:86d0:fd8 with SMTP id my26-20020a1709065a5a00b0077086d00fd8mr329690ejc.164.1663254387679; Thu, 15 Sep 2022 08:06:27 -0700 (PDT) Date: Thu, 15 Sep 2022 17:04:14 +0200 In-Reply-To: <20220915150417.722975-1-glider@google.com> Mime-Version: 1.0 References: <20220915150417.722975-1-glider@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220915150417.722975-41-glider@google.com> Subject: [PATCH v7 40/43] entry: kmsan: introduce kmsan_unpoison_entry_regs() From: Alexander Potapenko To: glider@google.com Cc: Alexander Viro , Alexei Starovoitov , Andrew Morton , Andrey Konovalov , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Christoph Hellwig , Christoph Lameter , David Rientjes , Dmitry Vyukov , Eric Biggers , Eric Dumazet , Greg Kroah-Hartman , Herbert Xu , Ilya Leoshkevich , Ingo Molnar , Jens Axboe , Joonsoo Kim , Kees Cook , Marco Elver , Mark Rutland , Matthew Wilcox , "Michael S. Tsirkin" , Pekka Enberg , Peter Zijlstra , Petr Mladek , Stephen Rothwell , Steven Rostedt , Thomas Gleixner , Vasily Gorbik , Vegard Nossum , Vlastimil Babka , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663254389; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=S+kwzH5LfDyg6tc+T47KWRR4zTWxpHjqyuN2TRvGEwc=; b=ZzvUXnz3d5GNAVN3B03pftUuo+e5H62cCQEmYQNkKcuVSkJcD/cXFGIp/iN0MxxUoTdede uQBqs2vlcSQWLKvUfEqjXK83qHDkY+lwMiCDcdY7W42d/KhMIFMBZmKyfXkQD2128dJhTb zOboDBHsuMIKE2m5afTT+TtYR9tFsTc= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=ikiVkwTW; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf15.hostedemail.com: domain of 3cz8jYwYKCJ4EJGBCPEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--glider.bounces.google.com designates 209.85.208.73 as permitted sender) smtp.mailfrom=3cz8jYwYKCJ4EJGBCPEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--glider.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663254389; a=rsa-sha256; cv=none; b=YlsCfQ/fg4uTxjd9r0kdybKRmGeXLPg7b9Zrrq/ez0fCu/IaiBpdeQbxM/ypanuR5+eWSl Af1qAwHEurSsbE0G9VkTVQHqhyOqrqSQhQQUP+2yaC987nfOhzior9GAWX0tmyzncDLBAA AnT0Hku1UOApXhA6eJsiGgumP6/RHUM= X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 52FD6A00B4 X-Rspam-User: X-Stat-Signature: onyo4nazk7ozzytm9atjd3kfd8wmiubz Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=ikiVkwTW; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf15.hostedemail.com: domain of 3cz8jYwYKCJ4EJGBCPEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--glider.bounces.google.com designates 209.85.208.73 as permitted sender) smtp.mailfrom=3cz8jYwYKCJ4EJGBCPEMMEJC.AMKJGLSV-KKIT8AI.MPE@flex--glider.bounces.google.com X-HE-Tag: 1663254389-300683 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: struct pt_regs passed into IRQ entry code is set up by uninstrumented asm functions, therefore KMSAN may not notice the registers are initialized. kmsan_unpoison_entry_regs() unpoisons the contents of struct pt_regs, preventing potential false positives. Unlike kmsan_unpoison_memory(), it can be called under kmsan_in_runtime(), which is often the case in IRQ entry code. Signed-off-by: Alexander Potapenko --- Link: https://linux-review.googlesource.com/id/Ibfd7018ac847fd8e5491681f508ba5d14e4669cf --- include/linux/kmsan.h | 15 +++++++++++++++ kernel/entry/common.c | 5 +++++ mm/kmsan/hooks.c | 26 ++++++++++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/include/linux/kmsan.h b/include/linux/kmsan.h index c473e0e21683c..e38ae3c346184 100644 --- a/include/linux/kmsan.h +++ b/include/linux/kmsan.h @@ -214,6 +214,17 @@ void kmsan_handle_dma_sg(struct scatterlist *sg, int nents, */ void kmsan_handle_urb(const struct urb *urb, bool is_out); +/** + * kmsan_unpoison_entry_regs() - Handle pt_regs in low-level entry code. + * @regs: struct pt_regs pointer received from assembly code. + * + * KMSAN unpoisons the contents of the passed pt_regs, preventing potential + * false positive reports. Unlike kmsan_unpoison_memory(), + * kmsan_unpoison_entry_regs() can be called from the regions where + * kmsan_in_runtime() returns true, which is the case in early entry code. + */ +void kmsan_unpoison_entry_regs(const struct pt_regs *regs); + #else static inline void kmsan_init_shadow(void) @@ -310,6 +321,10 @@ static inline void kmsan_handle_urb(const struct urb *urb, bool is_out) { } +static inline void kmsan_unpoison_entry_regs(const struct pt_regs *regs) +{ +} + #endif #endif /* _LINUX_KMSAN_H */ diff --git a/kernel/entry/common.c b/kernel/entry/common.c index 063068a9ea9b3..846add8394c41 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -24,6 +25,7 @@ static __always_inline void __enter_from_user_mode(struct pt_regs *regs) user_exit_irqoff(); instrumentation_begin(); + kmsan_unpoison_entry_regs(regs); trace_hardirqs_off_finish(); instrumentation_end(); } @@ -352,6 +354,7 @@ noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs) lockdep_hardirqs_off(CALLER_ADDR0); ct_irq_enter(); instrumentation_begin(); + kmsan_unpoison_entry_regs(regs); trace_hardirqs_off_finish(); instrumentation_end(); @@ -367,6 +370,7 @@ noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs) */ lockdep_hardirqs_off(CALLER_ADDR0); instrumentation_begin(); + kmsan_unpoison_entry_regs(regs); rcu_irq_enter_check_tick(); trace_hardirqs_off_finish(); instrumentation_end(); @@ -452,6 +456,7 @@ irqentry_state_t noinstr irqentry_nmi_enter(struct pt_regs *regs) ct_nmi_enter(); instrumentation_begin(); + kmsan_unpoison_entry_regs(regs); trace_hardirqs_off_finish(); ftrace_nmi_enter(); instrumentation_end(); diff --git a/mm/kmsan/hooks.c b/mm/kmsan/hooks.c index 79d7e73e2cfd8..35f6b6e6a908c 100644 --- a/mm/kmsan/hooks.c +++ b/mm/kmsan/hooks.c @@ -348,6 +348,32 @@ void kmsan_unpoison_memory(const void *address, size_t size) } EXPORT_SYMBOL(kmsan_unpoison_memory); +/* + * Version of kmsan_unpoison_memory() that can be called from within the KMSAN + * runtime. + * + * Non-instrumented IRQ entry functions receive struct pt_regs from assembly + * code. Those regs need to be unpoisoned, otherwise using them will result in + * false positives. + * Using kmsan_unpoison_memory() is not an option in entry code, because the + * return value of in_task() is inconsistent - as a result, certain calls to + * kmsan_unpoison_memory() are ignored. kmsan_unpoison_entry_regs() ensures that + * the registers are unpoisoned even if kmsan_in_runtime() is true in the early + * entry code. + */ +void kmsan_unpoison_entry_regs(const struct pt_regs *regs) +{ + unsigned long ua_flags; + + if (!kmsan_enabled) + return; + + ua_flags = user_access_save(); + kmsan_internal_unpoison_memory((void *)regs, sizeof(*regs), + KMSAN_POISON_NOCHECK); + user_access_restore(ua_flags); +} + void kmsan_check_memory(const void *addr, size_t size) { if (!kmsan_enabled)