From patchwork Thu Mar 18 23:54:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 404181 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp921725jai; Thu, 18 Mar 2021 16:55:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0l4uIVa4Xod9YMF+uuGwNh0DDi53b+Wg2QIxwYIC7XP4wNWVXpTppm0BrKR3iKrjgCuLI X-Received: by 2002:aa7:c150:: with SMTP id r16mr6500762edp.96.1616111754962; Thu, 18 Mar 2021 16:55:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616111754; cv=none; d=google.com; s=arc-20160816; b=b5MZqX0iL20DZiZpVc1ag41pAlqzOXVvAqLGCqH6b8dKhD1u91Jbf/VxrDoBCZ6A71 EE6U6zxiERogKwZloxO9ILG7hK/P7rBGfPlKsi1BM4xaR7eHWNzSy3qJ3mkT6Fm1e1Sf OO6bYmM0qj8UKxrcr9sDEkeq3kzBt5PrvUdSOQghF+qARgHEkjn9/GfEyCc3WowPGPDY HneCSS2S0M+ofBZL1pgF6+vEjkEPUfdoilK6nkMSh73nO9EkL2LV97XkshQ2hU8rucaH pWVEepeBZacESdplrmdjKPOZw1WAlntmrr9rFzXdGyonqd8J3ho1ChqLbJBfE7NQTbK/ 9o5Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7hUuphUSwp1IoZeGVtvLATDDtgHRmQpDvtY9aJO+C/Q=; b=UeWmwigwuwhRMZuJ7YG/1iDEQI1JMeElARehRaELdzoH6+6blRpWgnbjZi7PPYFt4J 2i0B/lxWuU7KO3lucN+mkB7NYDvSLHhU+vvec0n+I3HLblfIKkGNS8sNvcncyBtLeehR SH6jfHQkUgHh+DNyAMvGQTsDar3YksFMmo8YV6bZTt2ngdCYc4cEAaJNUrY84GTQjQ1W ExC66IDTc/MpkYsD18+vkoO4R3jvAEHQoXKcVcRPeJDkaCUKszsjmQi6MWZwcfzHCDof h5Fm5FTU2h9vp31MIBXBdn2eYhR0YFrSZzYP2TQk3f5t4vYKFLmsK518yRzXXUJxaTXG YZHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=KUrUcrQr; 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=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a10si3033750edf.499.2021.03.18.16.55.54; Thu, 18 Mar 2021 16:55:54 -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=@chromium.org header.s=google header.b=KUrUcrQr; 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=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230510AbhCRXzS (ORCPT + 12 others); Thu, 18 Mar 2021 19:55:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232281AbhCRXys (ORCPT ); Thu, 18 Mar 2021 19:54:48 -0400 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2D66C06174A for ; Thu, 18 Mar 2021 16:54:48 -0700 (PDT) Received: by mail-pl1-x62c.google.com with SMTP id h20so2092091plr.4 for ; Thu, 18 Mar 2021 16:54:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7hUuphUSwp1IoZeGVtvLATDDtgHRmQpDvtY9aJO+C/Q=; b=KUrUcrQrNMyP4vVIk00GJ9UR/kv5wCQ6sYLjVFcZumfp056yrovv+rmcbLMFD7r4WJ 2IuE3rahTrsrxcMK0MmGPrL/noOhZAP5ZRKdw6TPSjkSOK97u5bIqusIhVhgNBMEfXZr Z5OpVdRVkB8Li4Jqi+I6lFqZD325YA6BxTvBU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7hUuphUSwp1IoZeGVtvLATDDtgHRmQpDvtY9aJO+C/Q=; b=YcTOPZ57DQ4Zfd+UNm2BYBHFMrm3FDiFiGOUYLbhqrfL31h3ciKw3fpVlUTgDAcwwG 4Q+8IGNIgAwAsICLWkmRNVu3GHmV4OHo5vUaItWeo1QOq8DZLAXdzITUlI+GFV28n3Wi qjFIiH+nt/wkmjyXncp93aGJjQZXVjhccFgP4Ae3ZFwWEDnGmIGoUXA0R+5KO3OLZrwH K0G7S6Ub6kdUB+l/t5dr7MVfv1QzMnZjK8SMR1WKGFPay7Up39hppopfdZVjHhiaVC+g jvBO+OpbADEYS8xqzn5oazjJvxM1X/w/mSAYsMiC2v/ioq5H5xV1Qva+cEM35DdHjCvf O4TQ== X-Gm-Message-State: AOAM532AqJnr/pdMQ/TUpGFpyGA1S9kmXQG/U/dtpdmq6xh9Mq7mCeey obueUpRviQb1kipDfdtVjAfBtMOIVizjag== X-Received: by 2002:a17:90a:f2d2:: with SMTP id gt18mr6833009pjb.210.1616111688131; Thu, 18 Mar 2021 16:54:48 -0700 (PDT) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:dc70:2def:a801:e21b]) by smtp.gmail.com with ESMTPSA id t7sm3295816pfg.69.2021.03.18.16.54.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 16:54:47 -0700 (PDT) From: Nicolas Boichat To: stable@vger.kernel.org Cc: Mark Rutland , Arnd Bergmann , Greg Kroah-Hartman , Kees Cook , Nicolas Boichat , clang-built-linux@googlegroups.com, linux-kernel@vger.kernel.org Subject: [for-stable-4.19 PATCH 2/2] lkdtm: don't move ctors to .rodata Date: Fri, 19 Mar 2021 07:54:16 +0800 Message-Id: <20210319075410.for-stable-4.19.2.I0387622b15d84eed675e48a0ba3be9c03b9f9e97@changeid> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog In-Reply-To: <20210318235416.794798-1-drinkcat@chromium.org> References: <20210318235416.794798-1-drinkcat@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Rutland commit 3f618ab3323407ee4c6a6734a37eb6e9663ebfb9 upstream. When building with KASAN and LKDTM, clang may implictly generate an asan.module_ctor function in the LKDTM rodata object. The Makefile moves the lkdtm_rodata_do_nothing() function into .rodata by renaming the file's .text section to .rodata, and consequently also moves the ctor function into .rodata, leading to a boot time crash (splat below) when the ctor is invoked by do_ctors(). Let's prevent this by marking the function as noinstr rather than notrace, and renaming the file's .noinstr.text to .rodata. Marking the function as noinstr will prevent tracing and kprobes, and will inhibit any undesireable compiler instrumentation. The ctor function (if any) will be placed in .text and will work correctly. Example splat before this patch is applied: [ 0.916359] Unable to handle kernel execute from non-executable memory at virtual address ffffa0006b60f5ac [ 0.922088] Mem abort info: [ 0.922828] ESR = 0x8600000e [ 0.923635] EC = 0x21: IABT (current EL), IL = 32 bits [ 0.925036] SET = 0, FnV = 0 [ 0.925838] EA = 0, S1PTW = 0 [ 0.926714] swapper pgtable: 4k pages, 48-bit VAs, pgdp=00000000427b3000 [ 0.928489] [ffffa0006b60f5ac] pgd=000000023ffff003, p4d=000000023ffff003, pud=000000023fffe003, pmd=0068000042000f01 [ 0.931330] Internal error: Oops: 8600000e [#1] PREEMPT SMP [ 0.932806] Modules linked in: [ 0.933617] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.10.0-rc7 #2 [ 0.935620] Hardware name: linux,dummy-virt (DT) [ 0.936924] pstate: 40400005 (nZcv daif +PAN -UAO -TCO BTYPE=--) [ 0.938609] pc : asan.module_ctor+0x0/0x14 [ 0.939759] lr : do_basic_setup+0x4c/0x70 [ 0.940889] sp : ffff27b600177e30 [ 0.941815] x29: ffff27b600177e30 x28: 0000000000000000 [ 0.943306] x27: 0000000000000000 x26: 0000000000000000 [ 0.944803] x25: 0000000000000000 x24: 0000000000000000 [ 0.946289] x23: 0000000000000001 x22: 0000000000000000 [ 0.947777] x21: ffffa0006bf4a890 x20: ffffa0006befb6c0 [ 0.949271] x19: ffffa0006bef9358 x18: 0000000000000068 [ 0.950756] x17: fffffffffffffff8 x16: 0000000000000000 [ 0.952246] x15: 0000000000000000 x14: 0000000000000000 [ 0.953734] x13: 00000000838a16d5 x12: 0000000000000001 [ 0.955223] x11: ffff94000da74041 x10: dfffa00000000000 [ 0.956715] x9 : 0000000000000000 x8 : ffffa0006b60f5ac [ 0.958199] x7 : f9f9f9f9f9f9f9f9 x6 : 000000000000003f [ 0.959683] x5 : 0000000000000040 x4 : 0000000000000000 [ 0.961178] x3 : ffffa0006bdc15a0 x2 : 0000000000000005 [ 0.962662] x1 : 00000000000000f9 x0 : ffffa0006bef9350 [ 0.964155] Call trace: [ 0.964844] asan.module_ctor+0x0/0x14 [ 0.965895] kernel_init_freeable+0x158/0x198 [ 0.967115] kernel_init+0x14/0x19c [ 0.968104] ret_from_fork+0x10/0x30 [ 0.969110] Code: 00000003 00000000 00000000 00000000 (00000000) [ 0.970815] ---[ end trace b5339784e20d015c ]--- Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Cc: Kees Cook Acked-by: Kees Cook Signed-off-by: Mark Rutland Link: https://lore.kernel.org/r/20201207170533.10738-1-mark.rutland@arm.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Nicolas Boichat --- drivers/misc/lkdtm/Makefile | 2 +- drivers/misc/lkdtm/rodata.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.31.0.rc2.261.g7f71774620-goog diff --git a/drivers/misc/lkdtm/Makefile b/drivers/misc/lkdtm/Makefile index cce47a15a79f..aeb960cb096d 100644 --- a/drivers/misc/lkdtm/Makefile +++ b/drivers/misc/lkdtm/Makefile @@ -13,7 +13,7 @@ KCOV_INSTRUMENT_rodata.o := n OBJCOPYFLAGS := OBJCOPYFLAGS_rodata_objcopy.o := \ - --rename-section .text=.rodata,alloc,readonly,load + --rename-section .noinstr.text=.rodata,alloc,readonly,load targets += rodata.o rodata_objcopy.o $(obj)/rodata_objcopy.o: $(obj)/rodata.o FORCE $(call if_changed,objcopy) diff --git a/drivers/misc/lkdtm/rodata.c b/drivers/misc/lkdtm/rodata.c index 58d180af72cf..baacb876d1d9 100644 --- a/drivers/misc/lkdtm/rodata.c +++ b/drivers/misc/lkdtm/rodata.c @@ -5,7 +5,7 @@ */ #include "lkdtm.h" -void notrace lkdtm_rodata_do_nothing(void) +void noinstr lkdtm_rodata_do_nothing(void) { /* Does nothing. We just want an architecture agnostic "return". */ }