From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C22EC43603 for ; Fri, 20 Dec 2019 18:52:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6086D206D8 for ; Fri, 20 Dec 2019 18:52:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="RDbApYLB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6086D206D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 0A6408E01CD; Fri, 20 Dec 2019 13:52:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 057508E019D; Fri, 20 Dec 2019 13:52:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E611A8E01CD; Fri, 20 Dec 2019 13:52:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0098.hostedemail.com [216.40.44.98]) by kanga.kvack.org (Postfix) with ESMTP id C9BBA8E019D for ; Fri, 20 Dec 2019 13:52:16 -0500 (EST) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id 7B02A4435 for ; Fri, 20 Dec 2019 18:52:16 +0000 (UTC) X-FDA: 76286415072.12.drain90_883853918fa41 X-HE-Tag: drain90_883853918fa41 X-Filterd-Recvd-Size: 5408 Received: from mail-qk1-f201.google.com (mail-qk1-f201.google.com [209.85.222.201]) by imf34.hostedemail.com (Postfix) with ESMTP for ; Fri, 20 Dec 2019 18:52:15 +0000 (UTC) Received: by mail-qk1-f201.google.com with SMTP id 65so2508320qkl.23 for ; Fri, 20 Dec 2019 10:52:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=CiRi8eVQTkLKHE7tnyG2i1vQ7wo3YYoIst55ZajAzl4=; b=RDbApYLBDilSrXegs+KZN2vSoPbg0eVigN+vPirvJztqQE4c0F7FyFqzUCEwCcM1rz FGIWtZ55RIaLaPm/L+bYLQhxVeMH2yN5jn7TxA+1fATj9/o4WhJEuf5VAvxIJlrPYs8B NBE+hzQHShq3veB+ZwL35f/yN11DEgviKI1hO3wI+cP4eS//ps/LONsMdaCDB/gsyMsI KZaR+bS+YHJiJ695SNt8Ef3McVlZWqT1rZaLH96z7n3xkPTDEW7Aml4RRP2Rz0H86Xwk qVwkeRfjgEW524DXVUqGLoPj4KkgzBD7BBTV4clKRMef6GBjDC5QZuhsB1zubzFsZbZ2 kdaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=CiRi8eVQTkLKHE7tnyG2i1vQ7wo3YYoIst55ZajAzl4=; b=HHbC+gwQJx9U9+FyeCp0xRT+kkyj4LbAUQSb/wF21+hLN8gLV9gwSzv1c8oH0mab8R /7uzvPUZn8xGFAFTGN1Vj6bs2A31277I/PA8sLuBQKvKKN+huKKe0hkGYAW4fYjwN2zO vXq5tikAPoOF6YHoLx0uFLPxERjwsWRAyDQ0nZSa2r0XcMJefIwlmircFKNUrBy9bpFZ WWh6uubwCKHKaUDNOqN0hNQhuwop8Wqz5Kx2jODFmsOXOJ2STnDcsyuZsFirGuxzuLVX ghWivX3OqhMvQbtdU4H51mdFiKLkUHDqx71NM2bw9VIVUQe0dyAMdz7ftyEFhlJaUbJt +D9Q== X-Gm-Message-State: APjAAAUtQKAaNmMhpOO2akv40bT055YY+zwiNgPPI2rDqZo42BTs1aVI EH2vyk1LMkjrUauTi4vJCvki8SC4Vs0= X-Google-Smtp-Source: APXvYqyDDE/D+nI9Hv6gugyoVC3rsj7IO0CK6VwmBnDz7CbDPy54AmoUSIZ+CqLpA0fRhCP9Cv5I/okKCN0= X-Received: by 2002:a37:3d8:: with SMTP id 207mr14438044qkd.335.1576867935274; Fri, 20 Dec 2019 10:52:15 -0800 (PST) Date: Fri, 20 Dec 2019 19:49:55 +0100 In-Reply-To: <20191220184955.223741-1-glider@google.com> Message-Id: <20191220184955.223741-43-glider@google.com> Mime-Version: 1.0 References: <20191220184955.223741-1-glider@google.com> X-Mailer: git-send-email 2.24.1.735.g03f4e72817-goog Subject: [PATCH RFC v4 42/42] kmsan: x86/uprobes: unpoison regs in arch_uprobe_exception_notify() From: glider@google.com To: Thomas Gleixner , Andrew Morton , Vegard Nossum , Dmitry Vyukov , Marco Elver , Andrey Konovalov , linux-mm@kvack.org Cc: glider@google.com, viro@zeniv.linux.org.uk, adilger.kernel@dilger.ca, aryabinin@virtuozzo.com, luto@kernel.org, ard.biesheuvel@linaro.org, arnd@arndb.de, hch@infradead.org, hch@lst.de, darrick.wong@oracle.com, davem@davemloft.net, dmitry.torokhov@gmail.com, ebiggers@google.com, edumazet@google.com, ericvh@gmail.com, gregkh@linuxfoundation.org, harry.wentland@amd.com, herbert@gondor.apana.org.au, iii@linux.ibm.com, mingo@elte.hu, jasowang@redhat.com, axboe@kernel.dk, m.szyprowski@samsung.com, mark.rutland@arm.com, martin.petersen@oracle.com, schwidefsky@de.ibm.com, willy@infradead.org, mst@redhat.com, mhocko@suse.com, monstr@monstr.eu, pmladek@suse.com, cai@lca.pw, rdunlap@infradead.org, robin.murphy@arm.com, sergey.senozhatsky@gmail.com, rostedt@goodmis.org, tiwai@suse.com, tytso@mit.edu, gor@linux.ibm.com, wsa@the-dreams.de Content-Type: text/plain; charset="UTF-8" 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: arch_uprobe_exception_notify() may receive register state without valid KMSAN metadata, which will lead to false positives. Explicitly unpoison args and args->regs to avoid this. Signed-off-by: Alexander Potapenko To: Alexander Potapenko Cc: Thomas Gleixner Cc: Andrew Morton Cc: Vegard Nossum Cc: Dmitry Vyukov Cc: Marco Elver Cc: Andrey Konovalov Cc: linux-mm@kvack.org --- This patch was split from "kmsan: disable instrumentation of certain functions" v4: - split this patch away Change-Id: I466ef628b00362ab5eb1852c76baa8cdb06736d9 --- arch/x86/kernel/uprobes.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c index 15e5aad8ac2c..bc156b016dc5 100644 --- a/arch/x86/kernel/uprobes.c +++ b/arch/x86/kernel/uprobes.c @@ -8,6 +8,7 @@ * Jim Keniston */ #include +#include #include #include #include @@ -997,9 +998,13 @@ int arch_uprobe_post_xol(struct arch_uprobe *auprobe, struct pt_regs *regs) int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val, void *data) { struct die_args *args = data; - struct pt_regs *regs = args->regs; + struct pt_regs *regs; int ret = NOTIFY_DONE; + kmsan_unpoison_shadow(args, sizeof(*args)); + regs = args->regs; + if (regs) + kmsan_unpoison_shadow(regs, sizeof(*regs)); /* We are only interested in userspace traps */ if (regs && !user_mode(regs)) return NOTIFY_DONE; -- 2.24.1.735.g03f4e72817-goog