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;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
CC:     Arnd Bergmann <arnd@arndb.de>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.9 133/219] lkdtm: turn off kcov for
 lkdtm_rodata_do_nothing:
Thread-Topic: [PATCH AUTOSEL for 4.9 133/219] lkdtm: turn off kcov for
 lkdtm_rodata_do_nothing:
Thread-Index: AQHTsz8OcZTSQPHXtUGh5S7jhkIfwQ==
Date:   Sat, 3 Mar 2018 22:29:13 +0000
Message-ID: <20180303222716.26640-133-alexander.levin@microsoft.com>
References: <20180303222716.26640-1-alexander.levin@microsoft.com>
In-Reply-To: <20180303222716.26640-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 211e2953-e4a6-4acc-effb-08d58156fa6c
X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2018 22:29:13.4319
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB0924
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Arnd Bergmann <arnd@arndb.de>

[ Upstream commit 7064dc7fc13b2994d33ae540ffb7a3a05ac463bf ]

I ran into a link error on ARM64 for lkdtm_rodata_do_nothing:

drivers/misc/built-in.o: In function `lkdtm_rodata_do_nothing':
:(.rodata+0x68c8): relocation truncated to fit: R_AARCH64_CALL26 against sy=
mbol `__sanitizer_cov_trace_pc' defined in .text section in kernel/built-in=
.o

I did not analyze this further, but my theory is that we would need a tramp=
oline
to call __sanitizer_cov_trace_pc(), but the linker (correctly) only adds tr=
ampolines
for callers in executable sections.

Disabling KCOV for this one file avoids the build failure with no
other practical downsides I can think of.

The problem can only happen on kernels that contain both kcov and
lkdtm, so if we want to backport this, it should be in the earliest
version that has both (v4.8).

Fixes: 5c9a8750a640 ("kernel: add kcov code coverage")
Fixes: 9a49a528dcf3 ("lkdtm: add function for testing .rodata section")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Dmitry Vyukov <dvyukov@google.com>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 drivers/misc/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 31983366090a..2bf79ba4a39e 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -61,6 +61,8 @@ lkdtm-$(CONFIG_LKDTM)		+=3D lkdtm_perms.o
 lkdtm-$(CONFIG_LKDTM)		+=3D lkdtm_rodata_objcopy.o
 lkdtm-$(CONFIG_LKDTM)		+=3D lkdtm_usercopy.o
=20
+KCOV_INSTRUMENT_lkdtm_rodata.o	:=3D n
+
 OBJCOPYFLAGS :=3D
 OBJCOPYFLAGS_lkdtm_rodata_objcopy.o :=3D \
 			--set-section-flags .text=3Dalloc,readonly \
--=20
2.14.1