[5.10,047/104] lkdtm: dont move ctors to .rodata

Message ID	20210215152720.995680282@linuxfoundation.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org 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; From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>, Kees Cook <keescook@chromium.org>, Mark Rutland <mark.rutland@arm.com>, Stephen Boyd <swboyd@chromium.org> Subject: [PATCH 5.10 047/104] lkdtm: dont move ctors to .rodata Date: Mon, 15 Feb 2021 16:27:00 +0100 Message-Id: <20210215152720.995680282@linuxfoundation.org> In-Reply-To: <20210215152719.459796636@linuxfoundation.org> References: <20210215152719.459796636@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.10,002/104] Revert "dts: phy: add GPIO number and active state used for phy reset" [5.10,004/104] gpio: ep93xx: fix BUG_ON port F usage [5.10,005/104] gpio: ep93xx: Fix single irqchip with multi gpiochips [5.10,006/104] tracing: Do not count ftrace events in top level enable output [5.10,007/104] tracing: Check length before giving out the filter buffer [5.10,008/104] drm/i915: Fix overlay frontbuffer tracking [5.10,009/104] arm/xen: Dont probe xenbus as part of an early initcall [5.10,010/104] cgroup: fix psi monitor for root cgroup [5.10,011/104] Revert "drm/amd/display: Update NV1x SR latency values" [5.10,012/104] drm/i915/tgl+: Make sure TypeC FIA is powered up when initializing it [5.10,015/104] tmpfs: disallow CONFIG_TMPFS_INODE64 on s390 [5.10,017/104] soc: ti: omap-prm: Fix boot time errors for rst_map_012 bits 0 and 1 [5.10,018/104] arm64: dts: rockchip: Fix PCIe DT properties on rk3399 [5.10,019/104] arm64: dts: qcom: sdm845: Reserve LPASS clocks in gcc [5.10,021/104] arm64: dts: rockchip: remove interrupt-names property from rk3399 vdec node [5.10,022/104] kbuild: simplify GCC_PLUGINS enablement in dummy-tools/gcc [5.10,024/104] arm64: dts: rockchip: Disable display for NanoPi R2S [5.10,026/104] cap: fix conversions on getxattr [5.10,027/104] ovl: skip getxattr of security labels [5.10,030/104] nvme-pci: ignore the subsysem NQN on Phison E16 [5.10,031/104] drm/amd/display: Fix DPCD translation for LTTPR AUX_RD_INTERVAL [5.10,036/104] drm/amd/display: Decrement refcount of dc_sink before reassignment [5.10,037/104] riscv: virt_addr_valid must check the address belongs to linear mapping [5.10,040/104] kallsyms: fix nonconverging kallsyms table with lld [5.10,041/104] ARM: ensure the signal page contains defined contents [5.10,042/104] ARM: kexec: fix oops after TLB are invalidated [5.10,044/104] ubsan: implement __ubsan_handle_alignment_assumption [5.10,047/104] lkdtm: dont move ctors to .rodata [5.10,050/104] dmaengine: idxd: fix misc interrupt completion [5.10,051/104] ath9k: fix build error with LEDS_CLASS=m [5.10,056/104] bpf: Check for integer overflow when using roundup_pow_of_two() [5.10,057/104] netfilter: xt_recent: Fix attempt to update deleted entry [5.10,059/104] netfilter: nftables: fix possible UAF over chains from packet path in netns [5.10,061/104] xen/netback: avoid race in xenvif_rx_ring_slots_available() [5.10,062/104] net: hdlc_x25: Return meaningful error code in x25_open [5.10,063/104] net: ipa: set error code in gsi_channel_setup() [5.10,064/104] hv_netvsc: Reset the RSC count if NVSP_STAT_FAIL in netvsc_receive() [5.10,066/104] selftests: txtimestamp: fix compilation issue [5.10,068/104] ibmvnic: Clear failover_pending if unable to schedule [5.10,072/104] net: dsa: felix: implement port flushing on .phylink_mac_link_down [5.10,074/104] net: hns3: add a check for tqp_index in hclge_get_ring_chain_from_mbx() [5.10,075/104] net: hns3: add a check for index in hclge_get_rss_key() [5.10,078/104] drm/sun4i: dw-hdmi: always set clock rate [5.10,079/104] drm/sun4i: Fix H6 HDMI PHY configuration [5.10,081/104] clk: sunxi-ng: mp: fix parent rate change flag check [5.10,082/104] i2c: stm32f7: fix configuration of the digital filter [5.10,083/104] h8300: fix PREEMPTION build, TI_PRE_COUNT undefined [5.10,086/104] arm64: mte: Allow PTRACE_PEEKMTETAGS access to the zero page [5.10,087/104] rxrpc: Fix clearance of Tx/Rx ring when releasing a call [5.10,088/104] udp: fix skb_copy_and_csum_datagram with odd segment sizes [5.10,090/104] cpufreq: ACPI: Extend frequency tables to cover boost frequencies [5.10,092/104] net: gro: do not keep too many GRO packets in napi->rx_list [5.10,093/104] net: fix iteration for sctp transport seq_files [5.10,095/104] net/vmw_vsock: improve locking in vsock_connect_timeout() [5.10,097/104] bridge: mrp: Fix the usage of br_mrp_port_switchdev_set_state [5.10,103/104] ovl: expand warning in ovl_d_real()

Message ID

20210215152720.995680282@linuxfoundation.org

State

Superseded

Headers

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; 
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
	Kees Cook <keescook@chromium.org>, Mark Rutland <mark.rutland@arm.com>,
	Stephen Boyd <swboyd@chromium.org>
Subject: [PATCH 5.10 047/104] lkdtm: dont move ctors to .rodata
Date: Mon, 15 Feb 2021 16:27:00 +0100
Message-Id: <20210215152720.995680282@linuxfoundation.org>
In-Reply-To: <20210215152719.459796636@linuxfoundation.org>
References: <20210215152719.459796636@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Greg KH Feb. 15, 2021, 3:27 p.m. UTC

From: Mark Rutland <mark.rutland@arm.com>


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 <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Kees Cook <keescook@chromium.org>
Acked-by: Kees Cook <keescook@chromium.org>

Signed-off-by: Mark Rutland <mark.rutland@arm.com>

Link: https://lore.kernel.org/r/20201207170533.10738-1-mark.rutland@arm.com
Cc: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/misc/lkdtm/Makefile |    2 +-
 drivers/misc/lkdtm/rodata.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/misc/lkdtm/Makefile
+++ b/drivers/misc/lkdtm/Makefile
@@ -16,7 +16,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)
--- 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". */
 }

[5.10,047/104] lkdtm: dont move ctors to .rodata

Commit Message

Patch