[5.9,096/105] kbuild: avoid static_assert for genksyms

Message ID	20201214172559.899650121@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>, Ard Biesheuvel <ardb@kernel.org>, Masahiro Yamada <masahiroy@kernel.org>, Michal Marek <michal.lkml@markovi.net>, Kees Cook <keescook@chromium.org>, Rikard Falkeborn <rikard.falkeborn@gmail.com>, Marco Elver <elver@google.com>, Andrew Morton <akpm@linux-foundation.org>, Linus Torvalds <torvalds@linux-foundation.org> Subject: [PATCH 5.9 096/105] kbuild: avoid static_assert for genksyms Date: Mon, 14 Dec 2020 18:29:10 +0100 Message-Id: <20201214172559.899650121@linuxfoundation.org> In-Reply-To: <20201214172555.280929671@linuxfoundation.org> References: <20201214172555.280929671@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.9,002/105] mm/zsmalloc.c: drop ZSMALLOC_PGTABLE_MAPPING [5.9,005/105] ASoC: Intel: bytcr_rt5640: Fix HP Pavilion x2 Detachable quirks [5.9,007/105] net, xsk: Avoid taking multiple skbuff references [5.9,008/105] bpftool: Fix error return value in build_btf_type_table [5.9,009/105] vhost-vdpa: fix page pinning leakage in error path (rework) [5.9,011/105] batman-adv: Consider fragmentation for needed_headroom [5.9,014/105] ipvs: fix possible memory leak in ip_vs_control_net_init [5.9,015/105] ibmvnic: handle inconsistent login with reset [5.9,016/105] ibmvnic: stop free_all_rwi on failed reset [5.9,021/105] ibmvnic: reduce wait for completion time [5.9,022/105] drm/rockchip: Avoid uninitialized use of endpoint id in LVDS [5.9,023/105] drm/panel: sony-acx565akm: Fix race condition in probe [5.9,025/105] can: sja1000: sja1000_err(): dont count arbitration lose as an error [5.9,027/105] can: c_can: c_can_power_up(): fix error handling [5.9,028/105] can: kvaser_pciefd: kvaser_pciefd_open(): fix error handling [5.9,029/105] samples/ftrace: Mark my_tramp[12]? global [5.9,030/105] scsi: storvsc: Fix error return in storvsc_probe() [5.9,033/105] iwlwifi: pcie: invert values of NO_160 device config entries [5.9,035/105] usb: ohci-omap: Fix descriptor conversion [5.9,037/105] mm/mmap.c: fix mmap return value when vma is merged after call_mmap() [5.9,038/105] phy: usb: Fix incorrect clearing of tca_drv_sel bit in SETUP reg for 7211 [5.9,040/105] iwlwifi: pcie: limit memory read spin time [5.9,041/105] arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards. [5.9,045/105] iwlwifi: mvm: fix kernel panic in case of assert during CSA [5.9,047/105] arm64: dts: broadcom: clear the warnings caused by empty dma-ranges [5.9,048/105] ARC: stack unwinding: dont assume non-current task is sleeping [5.9,050/105] scsi: ufs: Make sure clk scaling happens only when HBA is runtime ACTIVE [5.9,051/105] interconnect: qcom: msm8916: Remove rpm-ids from non-RPM nodes [5.9,052/105] interconnect: qcom: qcs404: Remove GPU and display RPM IDs [5.9,055/105] drm/exynos: depend on COMMON_CLK to fix compile tests [5.9,056/105] spi: spi-nxp-fspi: fix fspi panic by unexpected interrupts [5.9,061/105] soc: fsl: dpio: Get the cpumask through cpumask_of(cpu) [5.9,064/105] arm64: tegra: Disable the ACONNECT for Jetson TX2 [5.9,068/105] platform/x86: thinkpad_acpi: Whitelist P15 firmware for dual fan control [5.9,071/105] platform/x86: touchscreen_dmi: Add info for the Predia Basic tablet [5.9,073/105] can: m_can: m_can_dev_setup(): add support for bosch mcan version 3.3.0 [5.9,074/105] s390: fix irq state tracing [5.9,075/105] intel_idle: Build fix [5.9,076/105] media: pulse8-cec: fix duplicate free at disconnect or probe error [5.9,077/105] media: pulse8-cec: add support for FW v10 and up [5.9,081/105] xen: add helpers for caching grant mapping pages [5.9,082/105] xen: dont use page->lru for ZONE_DEVICE memory [5.9,083/105] Input: cm109 - do not stomp on control URB [5.9,085/105] pinctrl: jasperlake: Fix HOSTSW_OWN offset [5.9,086/105] pinctrl: amd: remove debounce filter setting in IRQ type setting [5.9,090/105] drm/i915/gem: Propagate error from cancelled submit due to context closure [5.9,091/105] drm/i915/display/dp: Compute the correct slice count for VDSC on DP [5.9,093/105] drm/i915/gt: Ignore repeated attempts to suspend request flow across reset [5.9,094/105] drm/i915/gt: Cancel the preemption timeout on responding to it [5.9,096/105] kbuild: avoid static_assert for genksyms [5.9,097/105] proc: use untagged_addr() for pagemap_read addresses [5.9,098/105] mm/hugetlb: clear compound_nr before freeing gigantic pages [5.9,101/105] x86/mm/mem_encrypt: Fix definition of PMD_FLAGS_DEC_WP [5.9,102/105] x86/membarrier: Get rid of a dubious optimization [5.9,103/105] x86/apic/vector: Fix ordering in vector assignment

Message ID

20201214172559.899650121@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>,
	Ard Biesheuvel <ardb@kernel.org>, Masahiro Yamada <masahiroy@kernel.org>,
	Michal Marek <michal.lkml@markovi.net>,
	Kees Cook <keescook@chromium.org>,
	Rikard Falkeborn <rikard.falkeborn@gmail.com>,
	Marco Elver <elver@google.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH 5.9 096/105] kbuild: avoid static_assert for genksyms
Date: Mon, 14 Dec 2020 18:29:10 +0100
Message-Id: <20201214172559.899650121@linuxfoundation.org>
In-Reply-To: <20201214172555.280929671@linuxfoundation.org>
References: <20201214172555.280929671@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 Dec. 14, 2020, 5:29 p.m. UTC

From: Arnd Bergmann <arnd@arndb.de>


commit 14dc3983b5dff513a90bd5a8cc90acaf7867c3d0 upstream.

genksyms does not know or care about the _Static_assert() built-in, and
sometimes falls back to ignoring the later symbols, which causes
undefined behavior such as

  WARNING: modpost: EXPORT symbol "ethtool_set_ethtool_phy_ops" [vmlinux] version generation failed, symbol will not be versioned.
  ld: net/ethtool/common.o: relocation R_AARCH64_ABS32 against `__crc_ethtool_set_ethtool_phy_ops' can not be used when making a shared object
  net/ethtool/common.o:(_ftrace_annotated_branch+0x0): dangerous relocation: unsupported relocation

Redefine static_assert for genksyms to avoid that.

Link: https://lkml.kernel.org/r/20201203230955.1482058-1-arnd@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Suggested-by: Ard Biesheuvel <ardb@kernel.org>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Michal Marek <michal.lkml@markovi.net>
Cc: Kees Cook <keescook@chromium.org>
Cc: Rikard Falkeborn <rikard.falkeborn@gmail.com>
Cc: Marco Elver <elver@google.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>


---
 include/linux/build_bug.h |    5 +++++
 1 file changed, 5 insertions(+)

--- a/include/linux/build_bug.h
+++ b/include/linux/build_bug.h
@@ -77,4 +77,9 @@ 
 #define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr)
 #define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
 
+#ifdef __GENKSYMS__
+/* genksyms gets confused by _Static_assert */
+#define _Static_assert(expr, ...)
+#endif
+
 #endif	/* _LINUX_BUILD_BUG_H */

[5.9,096/105] kbuild: avoid static_assert for genksyms

Commit Message

Patch