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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 378E9C64E90 for ; Mon, 23 Nov 2020 20:12:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E699D20717 for ; Mon, 23 Nov 2020 20:12:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="neCUGBfU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733151AbgKWUM2 (ORCPT ); Mon, 23 Nov 2020 15:12:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731695AbgKWUJ6 (ORCPT ); Mon, 23 Nov 2020 15:09:58 -0500 Received: from mail-wm1-x34a.google.com (mail-wm1-x34a.google.com [IPv6:2a00:1450:4864:20::34a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B65DDC061A4D for ; Mon, 23 Nov 2020 12:09:58 -0800 (PST) Received: by mail-wm1-x34a.google.com with SMTP id y1so151344wma.5 for ; Mon, 23 Nov 2020 12:09:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=a641qLXzuR11g6BMkmBPCphI45HnOtEuvC8VFs/i0oY=; b=neCUGBfUlBvzHcri54FWSxW9eFHJEi3CWU5DBAF4zPMCbuvfGwsZupN3DKSl4x2YO2 7vqXobhxBlVc4efQ67niDqzzonPG6CmZ8lKtswsRFtHRB5S6KJ9BL9qLX1SY6jVRlK2J c8bK+1m7/xA2Uu4LJZyF6EdW29LWsdhb0mdcbLbKb1ISATTP9DZ4EW5trIjboNyfd7aC HYttI9r53xvHWS0nxs6X+83N2tlN7sqRPVBmyAHG05TyuIsDwicUrV8NPu7KlN4y34LU +ZxMuRL8VspB5gYyX/oM2BumjWXcbDi+SbTROi1rcPb8rDabu7K1Hw9NMV7Isx7hQ28t wgvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=a641qLXzuR11g6BMkmBPCphI45HnOtEuvC8VFs/i0oY=; b=f3lyczG3iBykLh4Gqg5fz/3s7O7c1cWdlsiodCJbtcQMFWkBueFdatOR17x0YEHGU/ bTG/1HqKkChHS0/ll+xfsAT/o5AceahnrxfA+1f4pjOE3TVGYrue3ulCN8OqefOgs2/R H5M9DoXk7NKdbdkDw8kRBIm7tng9Vl4VnApEjgyMmEBGZ3RHFUQ85uaPc3VG1U018VXA +hCE1slX2qPAgyFMPR4sA+0oSZFdlshuK3MEjinaE2S85O2V6Wx0kO9PWtmnVltGZ+Xp ILie6fVIUDopF2UXN66r7ek3cfWsA3yxrOQw/KJk/gx3DJGaSusloIzAThmcVASnCXRL kP7w== X-Gm-Message-State: AOAM532Cg2mdsq3pi2BNk72ofjlUEIywoQdPOr1oxDPzelH7eo5yrpzc Ual/P3vN8+ACvDtcDis4lOJ1xSRwbBS3zmEo X-Google-Smtp-Source: ABdhPJzbUN3oGIDfvcDJArPlcXQTm+qdElAwFv2IDBGPxqRS3v2vpJpKfw3cPWg5H2l2qDnAYZ5sX0jh1Pa8TG1/ Sender: "andreyknvl via sendgmr" X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:bd0b:: with SMTP id n11mr580484wmf.111.1606162197472; Mon, 23 Nov 2020 12:09:57 -0800 (PST) Date: Mon, 23 Nov 2020 21:08:02 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog Subject: [PATCH mm v11 38/42] kasan, arm64: print report from tag fault handler From: Andrey Konovalov To: Andrew Morton Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add error reporting for hardware tag-based KASAN. When CONFIG_KASAN_HW_TAGS is enabled, print KASAN report from the arm64 tag fault handler. SAS bits aren't set in ESR for all faults reported in EL1, so it's impossible to find out the size of the access the caused the fault. Adapt KASAN reporting code to handle this case. Signed-off-by: Andrey Konovalov Co-developed-by: Vincenzo Frascino Signed-off-by: Vincenzo Frascino Reviewed-by: Catalin Marinas Reviewed-by: Alexander Potapenko --- Change-Id: I3780fe7db6e075dff2937d3d8508f55c9322b095 --- arch/arm64/mm/fault.c | 14 ++++++++++++++ mm/kasan/report.c | 11 ++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 1e4b9353c68a..3aac2e72f81e 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -298,10 +299,23 @@ static void die_kernel_fault(const char *msg, unsigned long addr, do_exit(SIGKILL); } +#ifdef CONFIG_KASAN_HW_TAGS static void report_tag_fault(unsigned long addr, unsigned int esr, struct pt_regs *regs) { + bool is_write = ((esr & ESR_ELx_WNR) >> ESR_ELx_WNR_SHIFT) != 0; + + /* + * SAS bits aren't set for all faults reported in EL1, so we can't + * find out access size. + */ + kasan_report(addr, 0, is_write, regs->pc); } +#else +/* Tag faults aren't enabled without CONFIG_KASAN_HW_TAGS. */ +static inline void report_tag_fault(unsigned long addr, unsigned int esr, + struct pt_regs *regs) { } +#endif static void do_tag_recovery(unsigned long addr, unsigned int esr, struct pt_regs *regs) diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 2c503b667413..a69c2827a125 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -62,9 +62,14 @@ static void print_error_description(struct kasan_access_info *info) { pr_err("BUG: KASAN: %s in %pS\n", get_bug_type(info), (void *)info->ip); - pr_err("%s of size %zu at addr %px by task %s/%d\n", - info->is_write ? "Write" : "Read", info->access_size, - info->access_addr, current->comm, task_pid_nr(current)); + if (info->access_size) + pr_err("%s of size %zu at addr %px by task %s/%d\n", + info->is_write ? "Write" : "Read", info->access_size, + info->access_addr, current->comm, task_pid_nr(current)); + else + pr_err("%s at addr %px by task %s/%d\n", + info->is_write ? "Write" : "Read", + info->access_addr, current->comm, task_pid_nr(current)); } static DEFINE_SPINLOCK(report_lock); -- 2.29.2.454.gaff20da3a2-goog