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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 168B3C32771 for ; Thu, 16 Jan 2020 01:24:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C42652467E for ; Thu, 16 Jan 2020 01:24:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="B7I20849" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C42652467E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B6A498E001A; Wed, 15 Jan 2020 20:24:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AF2668E0003; Wed, 15 Jan 2020 20:24:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 96ED08E001A; Wed, 15 Jan 2020 20:24:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0135.hostedemail.com [216.40.44.135]) by kanga.kvack.org (Postfix) with ESMTP id 7E0428E0003 for ; Wed, 15 Jan 2020 20:24:26 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id 34C6A8248047 for ; Thu, 16 Jan 2020 01:24:26 +0000 (UTC) X-FDA: 76381752132.27.skin83_7df859f45b158 X-HE-Tag: skin83_7df859f45b158 X-Filterd-Recvd-Size: 8734 Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by imf29.hostedemail.com (Postfix) with ESMTP for ; Thu, 16 Jan 2020 01:24:25 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id r11so9059489pgf.1 for ; Wed, 15 Jan 2020 17:24:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=q9yyIQHmH5l6RRr9oXrsGBCw2p7gy7/zKkbegYq6Q+s=; b=B7I20849zduaZUej22ttALxy7KpacppyUhdQv1th1EbyGmfRtv2NhklqGAXCd1Yk/D A2MkOc6mg+JxfrAnAoKrmKGlVo+my3T/Ah2SNdDuBATJOSh66n91QfvL5cLmwAOnMA1w CKqyQ779gOAv3EBPiHu5x7+K4nn9ELNeDZaUA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q9yyIQHmH5l6RRr9oXrsGBCw2p7gy7/zKkbegYq6Q+s=; b=VFIT8pYznNXaGC/QgoP+c09C5enjuRL1V8ZNHDWjEy7nq7r7TDX6EFYV71dgQy3TW8 OVlBj17ueur5zMdfR/ItbsueHfBMSfxpuR3+IYBbEvl8UPtYTJ3hcHhPYHK8UXD3nE9N fBd4ZgGzasXDygY5KIENwDHyDa98zKXLYahsd59PbsErVv2JUUBuBq4rJ2LOoebG6p9Y U4PaSqui6NnlBl8asK9pcxf86blt4rAjSBauOtD2iw6rOYnkYUd7b2hToDaj5+qOXOT2 cRuMjIUv5YOL5mRjuR5je9U7BkOmaUOzI9Cyltex4hkoWuKacEu0/qaMepblXmsl3fsL o1vQ== X-Gm-Message-State: APjAAAXT+k9CxA9Sn8lJVXb1TcxOvzA3Zri623Wa+whX+NMTEP1eRUHc QG6KkiIpaQ77lF0s36R5Y1OLRg== X-Google-Smtp-Source: APXvYqyOAYblAndR/UL8Abnum2Ky8g1e0MSKZwDdBzyR2nJu09CRBhIWbjiNtyWu1tUKWCTcaalMuw== X-Received: by 2002:a63:e0f:: with SMTP id d15mr36134094pgl.255.1579137864589; Wed, 15 Jan 2020 17:24:24 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id bo19sm150751pjb.25.2020.01.15.17.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2020 17:24:23 -0800 (PST) From: Kees Cook To: Andrew Morton Cc: Kees Cook , Dmitry Vyukov , Andrey Ryabinin , Elena Petrova , Alexander Potapenko , Dan Carpenter , "Gustavo A. R. Silva" , Arnd Bergmann , Ard Biesheuvel , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-hardening@lists.openwall.com, syzkaller@googlegroups.com Subject: [PATCH v3 6/6] ubsan: Include bug type in report header Date: Wed, 15 Jan 2020 17:23:21 -0800 Message-Id: <20200116012321.26254-7-keescook@chromium.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116012321.26254-1-keescook@chromium.org> References: <20200116012321.26254-1-keescook@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: When syzbot tries to figure out how to deduplicate bug reports, it prefers seeing a hint about a specific bug type (we can do better than just "UBSAN"). This lifts the handler reason into the UBSAN report line that includes the file path that tripped a check. Unfortunately, UBSAN does not provide function names. Suggested-by: Dmitry Vyukov Link: https://lore.kernel.org/lkml/CACT4Y+bsLJ-wFx_TaXqax3JByUOWB3uk787Ls= yMVcfW6JzzGvg@mail.gmail.com Signed-off-by: Kees Cook --- lib/ubsan.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/lib/ubsan.c b/lib/ubsan.c index 429663eef6a7..057d5375bfc6 100644 --- a/lib/ubsan.c +++ b/lib/ubsan.c @@ -45,13 +45,6 @@ static bool was_reported(struct source_location *locat= ion) return test_and_set_bit(REPORTED_BIT, &location->reported); } =20 -static void print_source_location(const char *prefix, - struct source_location *loc) -{ - pr_err("%s %s:%d:%d\n", prefix, loc->file_name, - loc->line & LINE_MASK, loc->column & COLUMN_MASK); -} - static bool suppress_report(struct source_location *loc) { return current->in_ubsan || was_reported(loc); @@ -140,13 +133,14 @@ static void val_to_string(char *str, size_t size, s= truct type_descriptor *type, } } =20 -static void ubsan_prologue(struct source_location *location) +static void ubsan_prologue(struct source_location *loc, const char *reas= on) { current->in_ubsan++; =20 pr_err("=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D" "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); - print_source_location("UBSAN: Undefined behaviour in", location); + pr_err("UBSAN: %s in %s:%d:%d\n", reason, loc->file_name, + loc->line & LINE_MASK, loc->column & COLUMN_MASK); } =20 static void ubsan_epilogue(void) @@ -180,12 +174,12 @@ static void handle_overflow(struct overflow_data *d= ata, void *lhs, if (suppress_report(&data->location)) return; =20 - ubsan_prologue(&data->location); + ubsan_prologue(&data->location, type_is_signed(type) ? + "signed integer overflow" : + "unsigned integer overflow"); =20 val_to_string(lhs_val_str, sizeof(lhs_val_str), type, lhs); val_to_string(rhs_val_str, sizeof(rhs_val_str), type, rhs); - pr_err("%s integer overflow:\n", - type_is_signed(type) ? "signed" : "unsigned"); pr_err("%s %c %s cannot be represented in type %s\n", lhs_val_str, op, @@ -225,7 +219,7 @@ void __ubsan_handle_negate_overflow(struct overflow_d= ata *data, if (suppress_report(&data->location)) return; =20 - ubsan_prologue(&data->location); + ubsan_prologue(&data->location, "negation overflow"); =20 val_to_string(old_val_str, sizeof(old_val_str), data->type, old_val); =20 @@ -245,7 +239,7 @@ void __ubsan_handle_divrem_overflow(struct overflow_d= ata *data, if (suppress_report(&data->location)) return; =20 - ubsan_prologue(&data->location); + ubsan_prologue(&data->location, "division overflow"); =20 val_to_string(rhs_val_str, sizeof(rhs_val_str), data->type, rhs); =20 @@ -264,7 +258,7 @@ static void handle_null_ptr_deref(struct type_mismatc= h_data_common *data) if (suppress_report(data->location)) return; =20 - ubsan_prologue(data->location); + ubsan_prologue(data->location, "NULL pointer dereference"); =20 pr_err("%s null pointer of type %s\n", type_check_kinds[data->type_check_kind], @@ -279,7 +273,7 @@ static void handle_misaligned_access(struct type_mism= atch_data_common *data, if (suppress_report(data->location)) return; =20 - ubsan_prologue(data->location); + ubsan_prologue(data->location, "misaligned access"); =20 pr_err("%s misaligned address %p for type %s\n", type_check_kinds[data->type_check_kind], @@ -295,7 +289,7 @@ static void handle_object_size_mismatch(struct type_m= ismatch_data_common *data, if (suppress_report(data->location)) return; =20 - ubsan_prologue(data->location); + ubsan_prologue(data->location, "object size mismatch"); pr_err("%s address %p with insufficient space\n", type_check_kinds[data->type_check_kind], (void *) ptr); @@ -354,7 +348,7 @@ void __ubsan_handle_out_of_bounds(struct out_of_bound= s_data *data, void *index) if (suppress_report(&data->location)) return; =20 - ubsan_prologue(&data->location); + ubsan_prologue(&data->location, "array index out of bounds"); =20 val_to_string(index_str, sizeof(index_str), data->index_type, index); pr_err("index %s is out of range for type %s\n", index_str, @@ -375,7 +369,7 @@ void __ubsan_handle_shift_out_of_bounds(struct shift_= out_of_bounds_data *data, if (suppress_report(&data->location)) goto out; =20 - ubsan_prologue(&data->location); + ubsan_prologue(&data->location, "shift out of bounds"); =20 val_to_string(rhs_str, sizeof(rhs_str), rhs_type, rhs); val_to_string(lhs_str, sizeof(lhs_str), lhs_type, lhs); @@ -407,7 +401,7 @@ EXPORT_SYMBOL(__ubsan_handle_shift_out_of_bounds); =20 void __ubsan_handle_builtin_unreachable(struct unreachable_data *data) { - ubsan_prologue(&data->location); + ubsan_prologue(&data->location, "unreachable"); pr_err("calling __builtin_unreachable()\n"); ubsan_epilogue(); panic("can't return from __builtin_unreachable()"); @@ -422,7 +416,7 @@ void __ubsan_handle_load_invalid_value(struct invalid= _value_data *data, if (suppress_report(&data->location)) return; =20 - ubsan_prologue(&data->location); + ubsan_prologue(&data->location, "invalid load"); =20 val_to_string(val_str, sizeof(val_str), data->type, val); =20 --=20 2.20.1