From patchwork Mon Apr 19 13:06:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 423988 Delivered-To: patch@linaro.org Received: by 2002:a02:6a6f:0:0:0:0:0 with SMTP id m47csp2709099jaf; Mon, 19 Apr 2021 06:15:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjWsl2FykN9jv0GS7Rw6GQNzqxYG0gpBc2M0hSt5COgM0l9664zopmxcNrLW76IT8fXdLj X-Received: by 2002:a63:2c81:: with SMTP id s123mr11728121pgs.168.1618838122336; Mon, 19 Apr 2021 06:15:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618838122; cv=none; d=google.com; s=arc-20160816; b=KbgOOKveWM86GYrQd7DFen/doVzap2UwBwY5AiQjHXMBm11CRRsr9goLl4WnoYZGJ2 4luDaTuGICmYPCfDhjaWGhLI6FXmuBVCLCT0dic9QokxxJynvJU+RBUAfQQxRSMqmh5s 2RYppMkRwpsS2sRMIGnsXfN/GgcWZHyPTo2peS0cfHr0tdPgZgT01dBK6CqSESaADsem BhPSv757WmoHDMUMHqN48ITFh5GJCHBQMQSz32Fa/kOvuFpceuoOp/Osne/S0FSrRP0c jmAaVSarVNtSOi8vOnsLJ+frmhpF3jdroDE9J1zlc1IShOka/Oc5sPg6VdpYdvlJj2VK FgtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TvQSC5X9vTcZkOP66NgOg7owX0RHKHn1QOU7Yzx0kPQ=; b=TY11rqQ8+cFHjedeRzCRQYERh5aUBfhKNF0WbkRhvc5BoZ9PNptHn1RuW40FqOE36y G2eQaHvVOTCQZ0WsfvRe+VoaCHva7Rhs0qCn6o57ymI4ZCipqdc65fWL+MJ5xD9GoSzJ NNRQpRXorEWFYrIRwKvMUpX49AlYj8+M2OclrmOND79TUz3Oj61fjHlfwk+EtyAUjluR qHwSQcosSMyCqSg7iKW8rXOXj088Y5lGzLxqCJ/5KbBo7QHFOpFE5odhoJwghIfVohGS NlBWJ32iA7xbjMh2PZ2TkFOxAveM1uugUxav5WW+5yWD0aTkcnsndnKtDhOTQGIJKy7g 6oqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=at+fRNFp; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q2si16369865plc.419.2021.04.19.06.15.22; Mon, 19 Apr 2021 06:15:22 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=at+fRNFp; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239837AbhDSNPu (ORCPT + 12 others); Mon, 19 Apr 2021 09:15:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:46940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240368AbhDSNOG (ORCPT ); Mon, 19 Apr 2021 09:14:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 229E0613BF; Mon, 19 Apr 2021 13:12:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618837951; bh=jqlxbD4jWz55BNOzhYL6VinJOSoZoV0z2NCOXkKdtbA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=at+fRNFpgHzVrWsiJ17JI6mR1XFaNhDz2wb66Ss2pjAko/gLA8fjEgpQwnHgarC8l A8xYVfE/UIvQL/TGNgjDxBFmv6PiQXmCN4iMp70bzUzW3V2eTjn69YQQJ7xrWc0slU +crAC2Dvqioq/dwF/cFgA2IITlUvTK3njFegka5g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Marco Elver , Andrey Konovalov , Masahiro Yamada , Michal Marek , Andrey Ryabinin , Nathan Chancellor , Nick Desaulniers , Alexander Potapenko , Dmitry Vyukov , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH 5.11 113/122] kasan: fix hwasan build for gcc Date: Mon, 19 Apr 2021 15:06:33 +0200 Message-Id: <20210419130534.014788253@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419130530.166331793@linuxfoundation.org> References: <20210419130530.166331793@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 5c595ac4c776c44b5c59de22ab43b3fe256d9fbb ] gcc-11 adds support for -fsanitize=kernel-hwaddress, so it becomes possible to enable CONFIG_KASAN_SW_TAGS. Unfortunately this fails to build at the moment, because the corresponding command line arguments use llvm specific syntax. Change it to use the cc-param macro instead, which works on both clang and gcc. [elver@google.com: fixup for "kasan: fix hwasan build for gcc"] Link: https://lkml.kernel.org/r/YHQZVfVVLE/LDK2v@elver.google.com Link: https://lkml.kernel.org/r/20210323124112.1229772-1-arnd@kernel.org Signed-off-by: Arnd Bergmann Signed-off-by: Marco Elver Reviewed-by: Marco Elver Acked-by: Andrey Konovalov Cc: Masahiro Yamada Cc: Michal Marek Cc: Andrey Ryabinin Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: Alexander Potapenko Cc: Dmitry Vyukov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- scripts/Makefile.kasan | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.30.2 diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan index 1e000cc2e7b4..127012f45166 100644 --- a/scripts/Makefile.kasan +++ b/scripts/Makefile.kasan @@ -2,6 +2,8 @@ CFLAGS_KASAN_NOSANITIZE := -fno-builtin KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET) +cc-param = $(call cc-option, -mllvm -$(1), $(call cc-option, --param $(1))) + ifdef CONFIG_KASAN_GENERIC ifdef CONFIG_KASAN_INLINE @@ -12,8 +14,6 @@ endif CFLAGS_KASAN_MINIMAL := -fsanitize=kernel-address -cc-param = $(call cc-option, -mllvm -$(1), $(call cc-option, --param $(1))) - # -fasan-shadow-offset fails without -fsanitize CFLAGS_KASAN_SHADOW := $(call cc-option, -fsanitize=kernel-address \ -fasan-shadow-offset=$(KASAN_SHADOW_OFFSET), \ @@ -36,14 +36,14 @@ endif # CONFIG_KASAN_GENERIC ifdef CONFIG_KASAN_SW_TAGS ifdef CONFIG_KASAN_INLINE - instrumentation_flags := -mllvm -hwasan-mapping-offset=$(KASAN_SHADOW_OFFSET) + instrumentation_flags := $(call cc-param,hwasan-mapping-offset=$(KASAN_SHADOW_OFFSET)) else - instrumentation_flags := -mllvm -hwasan-instrument-with-calls=1 + instrumentation_flags := $(call cc-param,hwasan-instrument-with-calls=1) endif CFLAGS_KASAN := -fsanitize=kernel-hwaddress \ - -mllvm -hwasan-instrument-stack=$(CONFIG_KASAN_STACK) \ - -mllvm -hwasan-use-short-granules=0 \ + $(call cc-param,hwasan-instrument-stack=$(CONFIG_KASAN_STACK)) \ + $(call cc-param,hwasan-use-short-granules=0) \ $(instrumentation_flags) endif # CONFIG_KASAN_SW_TAGS