Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp750356ybn; Tue, 24 Sep 2019 08:58:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqym0UtgBD9h3WeTa6M1yDCZ1fZWRXUF3rGzr73IAXfSUtBO98f446t/dmMrGAoupPy3cVFV X-Received: by 2002:a17:906:6d53:: with SMTP id a19mr3158590ejt.144.1569340682854; Tue, 24 Sep 2019 08:58:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569340682; cv=none; d=google.com; s=arc-20160816; b=zjaPNOHqSTQ5H8FxQldqj3Z95oi7r1Nhas0LuEqlAZ2lBHX1yb969kyHz2Zq+wxxc2 HvYDLywUVseAxKHssyyCbF5z6YzTjaoz1ELBQgpWObTRntfVWVffiFoadLGGOK3AvO2B lyeWgXY87ZfUMGja9REMBeGgj2QD0fVJ97IiUFFA4yolds1mVGznJ/RY1lK0yvT3U9K0 2h6QHi3XVT+ooe66P8VmK6SXvpeipop0hAhYR2Epd0X1q02+YB8ywpJ6+8/2b+AsSxwQ 3Ilxf+q0m+uhXtumKwwUJU0dli+HeyI3UEDYukcy+ucp6T/Qf0uFmZ0gG/QFwbGWoysm eL3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3htRQl954QmBuJyLQwasHk4KigwbFor2wr91rI3ejzQ=; b=v0ero4xC/+QjYqtpcGgZCWlh4BocBkGobjSQzpEKPMs3lXiNGI5BaeqhXw9J5kstk8 Q4bEGobgBlR36hQhB5GmlKR/+4WiUwzbWnjAPTfOK9bxuVouOW2xzOqzzxJsRGD8LF3E FQvhjXlXLvvFkO62kPARGckpYeGOyoByXWaZRbdWnSh/b67JGP8JB5/Fapu3tyC3HcFA VBwZFqCAGbBDx9wQJvL1PhdfOC2aIFJiD6WKmoP+yawO033ajX70NJEbxx9XoJFSJ8en UOl4J33tc7Anqv8pzksFK0VS+qKLyFO69Mn+3GLLMLqj1/bJfUAWr7L+c70DrIYCRrl7 EcYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fkk5uMMk; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u14si1359782edq.167.2019.09.24.08.57.39; Tue, 24 Sep 2019 08:58:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fkk5uMMk; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439191AbfIVTf4 (ORCPT + 99 others); Sun, 22 Sep 2019 15:35:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:42822 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389931AbfIVSqg (ORCPT ); Sun, 22 Sep 2019 14:46:36 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 88E3320882; Sun, 22 Sep 2019 18:46:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177995; bh=Ykb93oMr+3gztSj7HV5KYl0vXoN7XcXRQ9o4/s8Ik+A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fkk5uMMkVMShTrcvFxZKg1pIfFeDCZQ6Xj85eIp61CvlqbybJPlcpKjNyeIfDZu6g EF/ZsVQJE9rQ6OZcHJIUfBH47Vt11E6vurTyDeMf6tWo29nMGN5LhRUqbEupJkZC1A dZQhK5w6YFB+BnIt3FwnTz8ib/QLUX7rUVBuD8Gs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mark Rutland , Catalin Marinas , Andrey Ryabinin , Will Deacon , Sasha Levin , linux-kbuild@vger.kernel.org, kasan-dev@googlegroups.com Subject: [PATCH AUTOSEL 5.3 086/203] kasan/arm64: fix CONFIG_KASAN_SW_TAGS && KASAN_INLINE Date: Sun, 22 Sep 2019 14:41:52 -0400 Message-Id: <20190922184350.30563-86-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Rutland [ Upstream commit 34b5560db40d2941cfbe82eca1641353d5aed1a9 ] The generic Makefile.kasan propagates CONFIG_KASAN_SHADOW_OFFSET into KASAN_SHADOW_OFFSET, but only does so for CONFIG_KASAN_GENERIC. Since commit: 6bd1d0be0e97936d ("arm64: kasan: Switch to using KASAN_SHADOW_OFFSET") ... arm64 defines CONFIG_KASAN_SHADOW_OFFSET in Kconfig rather than defining KASAN_SHADOW_OFFSET in a Makefile. Thus, if CONFIG_KASAN_SW_TAGS && KASAN_INLINE are selected, we get build time splats due to KASAN_SHADOW_OFFSET not being set: | [mark@lakrids:~/src/linux]% usellvm 8.0.1 usekorg 8.1.0 make ARCH=arm64 CROSS_COMPILE=aarch64-linux- CC=clang | scripts/kconfig/conf --syncconfig Kconfig | CC scripts/mod/empty.o | clang (LLVM option parsing): for the -hwasan-mapping-offset option: '' value invalid for uint argument! | scripts/Makefile.build:273: recipe for target 'scripts/mod/empty.o' failed | make[1]: *** [scripts/mod/empty.o] Error 1 | Makefile:1123: recipe for target 'prepare0' failed | make: *** [prepare0] Error 2 Let's fix this by always propagating CONFIG_KASAN_SHADOW_OFFSET into KASAN_SHADOW_OFFSET if CONFIG_KASAN is selected, moving the existing common definition of +CFLAGS_KASAN_NOSANITIZE to the top of Makefile.kasan. Cc: Catalin Marinas Signed-off-by: Mark Rutland Acked-by: Andrey Ryabinin Tested-by Steve Capper Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- scripts/Makefile.kasan | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan index 6410bd22fe387..03757cc60e06c 100644 --- a/scripts/Makefile.kasan +++ b/scripts/Makefile.kasan @@ -1,4 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 +ifdef CONFIG_KASAN +CFLAGS_KASAN_NOSANITIZE := -fno-builtin +KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET) +endif + ifdef CONFIG_KASAN_GENERIC ifdef CONFIG_KASAN_INLINE @@ -7,8 +12,6 @@ else call_threshold := 0 endif -KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET) - CFLAGS_KASAN_MINIMAL := -fsanitize=kernel-address cc-param = $(call cc-option, -mllvm -$(1), $(call cc-option, --param $(1))) @@ -45,7 +48,3 @@ CFLAGS_KASAN := -fsanitize=kernel-hwaddress \ $(instrumentation_flags) endif # CONFIG_KASAN_SW_TAGS - -ifdef CONFIG_KASAN -CFLAGS_KASAN_NOSANITIZE := -fno-builtin -endif -- 2.20.1