From patchwork Mon Apr 26 07:30:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 427528 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6d12:0:0:0:0 with SMTP id m18csp3588248ejr; Mon, 26 Apr 2021 00:45:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyY4GYTLDeZqbycWwJPIp0HwuULj5C4bOQW0I/2QXzXDJUdfssDGNAPKzO93jTuiAMavtr7 X-Received: by 2002:a17:902:aa98:b029:ec:a55f:f4bc with SMTP id d24-20020a170902aa98b02900eca55ff4bcmr17828068plr.82.1619423104600; Mon, 26 Apr 2021 00:45:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619423104; cv=none; d=google.com; s=arc-20160816; b=Zr4X9U81hPlnx8/t5cs9vtz3lPNWB5bT6uARVmraAcmjb8tiYweZyCmIi5Wg6XQ+n2 sPqI0Jk0bENT8jW8qVdPabM+Q1Xw6o9snVVY34dL2lfFB0f/jpBXF5XadlSbVxJm4I3L l38kmzDjE77KiUWKSdN04yLTWsTvDy2SwZhFZwhis8R4FSgKep1H4Pprv1v3fdgX6g6P Eu5lLJjSFsTX8jjHV+lDkgmII4K24yRU7lX+8RRo/a/PFQo0vWFzJq9I0JU2JHgPxvbv K/+Q6ELk/zJnTZO+mr8/1Hjmeho76BYTE3tkXT7WfYiSoG4ozCWHQqqKP1f4vRuEkfo8 9FqA== 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=POqe2o565aQuulG/lZMrY5LK+ClJ1FUwlqHpirY71ZaUVAtKSY4MFg6F3st5w7EPl2 bwSm6iVA9mHo/cEckc4iLamEdTPSYdTGNfqc7CKy/xp8hvOan36cwmcwmv0LHwfn7D3x p2P9MSZOu/bq8nwg4Qe8nz19yOB2r5IlIir3YcO9kRzP8+XDGrQMwU0beAb2gIQoBn+q RLIifPeyOUcceYfEQmAoaVgrqb/IewODNqDFk0ucjRzkwRHFya7XDY79eaHRm3dErk40 7bn7ubC5YJMKGSxhjL+5/m4NFSyH5ZjGMOuf7aPHrfi3pFYavTG8HgsO4oZUMjgdHw4T wXSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=b4zf9i8G; 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 lt4si18063974pjb.32.2021.04.26.00.45.04; Mon, 26 Apr 2021 00:45:04 -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=b4zf9i8G; 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 S232994AbhDZHpg (ORCPT + 12 others); Mon, 26 Apr 2021 03:45:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:34610 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232682AbhDZHoF (ORCPT ); Mon, 26 Apr 2021 03:44:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8E0AB613B3; Mon, 26 Apr 2021 07:40:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619422823; bh=jqlxbD4jWz55BNOzhYL6VinJOSoZoV0z2NCOXkKdtbA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b4zf9i8G9RLcgeAewK7OHqKhRuUZaCEATmfBSIfQ7Mk28py42WnJkrMLKWHJ9bm71 YDDvdrkuGYt/28m3LOrI8AjGs4kpS5oNeQw5fxIQGW/xXDNlL9I9ZDjKI25h0qruHj VlT8BrS8dmEu1PfUrc69tk30t0N6/suq5ww6pz48= 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.10 32/36] kasan: fix hwasan build for gcc Date: Mon, 26 Apr 2021 09:30:14 +0200 Message-Id: <20210426072819.880836700@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210426072818.777662399@linuxfoundation.org> References: <20210426072818.777662399@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