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=-15.7 required=3.0 tests=BAYES_00,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 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 06652C1B0E3 for ; Wed, 9 Dec 2020 23:50:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC28B23B53 for ; Wed, 9 Dec 2020 23:50:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387628AbgLIXuk (ORCPT ); Wed, 9 Dec 2020 18:50:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:35296 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730136AbgLIXuk (ORCPT ); Wed, 9 Dec 2020 18:50:40 -0500 Date: Wed, 09 Dec 2020 15:49:58 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1607557799; bh=xhVPKZh2BRMCpr6W7wIIFJoPqFCYUa999IWIh1wyXDY=; h=From:To:Subject:From; b=v2s6BE9ZCpnXhHw63R30hQkzo57+TLpgVdJuzCHcxN4wEbjqQJ9EoF3n11a1Dtr3b HabT38G8Fy8iKSv4sxauGLWcbOIOMrrlcVkaMDlOdNzZ5ZskDnA8j8gKsK7oToHnn2 89dcO2s+80MZCqrzcrH4kQNuYPIBIh/rpd0lxmL4= From: akpm@linux-foundation.org To: mm-commits@vger.kernel.org, sfr@canb.auug.org.au, keescook@chromium.org, elver@google.com, andreyknvl@google.com, dvyukov@google.com Subject: + kcov-dont-instrument-with-ubsan.patch added to -mm tree Message-ID: <20201209234958.2KKnl%akpm@linux-foundation.org> User-Agent: s-nail v14.9.10 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: kcov: don't instrument with UBSAN has been added to the -mm tree. Its filename is kcov-dont-instrument-with-ubsan.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/kcov-dont-instrument-with-ubsan.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/kcov-dont-instrument-with-ubsan.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Dmitry Vyukov Subject: kcov: don't instrument with UBSAN Both KCOV and UBSAN use compiler instrumentation. If UBSAN detects a bug in KCOV, it may cause infinite recursion via printk and other common functions. We already don't instrument KCOV with KASAN/KCSAN for this reason, don't instrument it with UBSAN as well. As a side effect this also resolves the following gcc warning: conflicting types for built-in function '__sanitizer_cov_trace_switch'; expected 'void(long unsigned int, void *)' [-Wbuiltin-declaration-mismatch] It's only reported when kcov.c is compiled with any of the sanitizers enabled. Size of the arguments is correct, it's just that gcc uses 'long' on 64-bit arches and 'long long' on 32-bit arches, while kernel type is always 'long long'. Link: https://lkml.kernel.org/r/20201209100152.2492072-1-dvyukov@google.com Signed-off-by: Dmitry Vyukov Reported-by: Stephen Rothwell Suggested-by: Marco Elver Acked-by: Marco Elver Reviewed-by: Andrey Konovalov Reviewed-by: Kees Cook Signed-off-by: Andrew Morton --- kernel/Makefile | 3 +++ 1 file changed, 3 insertions(+) --- a/kernel/Makefile~kcov-dont-instrument-with-ubsan +++ a/kernel/Makefile @@ -34,8 +34,11 @@ KCOV_INSTRUMENT_extable.o := n KCOV_INSTRUMENT_stacktrace.o := n # Don't self-instrument. KCOV_INSTRUMENT_kcov.o := n +# If sanitizers detect any issues in kcov, it may lead to recursion +# via printk, etc. KASAN_SANITIZE_kcov.o := n KCSAN_SANITIZE_kcov.o := n +UBSAN_SANITIZE_kcov.o := n CFLAGS_kcov.o := $(call cc-option, -fno-conserve-stack) -fno-stack-protector obj-y += sched/ _ Patches currently in -mm which might be from dvyukov@google.com are kcov-dont-instrument-with-ubsan.patch