mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/
synced 2026-04-18 06:33:43 -04:00
8678591b47
Commit3e86e4d74c("kbuild: keep .modinfo section in vmlinux.unstripped") added .modinfo to ELF_DETAILS while removing it from COMMON_DISCARDS, as it was needed in vmlinux.unstripped and ELF_DETAILS was present in all architecture specific vmlinux linker scripts. While this shuffle is fine for vmlinux, ELF_DETAILS and COMMON_DISCARDS may be used by other linker scripts, such as the s390 and x86 compressed boot images, which may not expect to have a .modinfo section. In certain circumstances, this could result in a bootloader failing to load the compressed kernel [1]. Commitddc6cbef3e("s390/boot/vmlinux.lds.S: Ensure bzImage ends with SecureBoot trailer") recently addressed this for the s390 bzImage but the same bug remains for arm, parisc, and x86. The presence of .modinfo in the x86 bzImage was the root cause of the issue worked around with commitd50f210913("kbuild: align modinfo section for Secureboot Authenticode EDK2 compat"). misc.c in arch/x86/boot/compressed includes lib/decompress_unzstd.c, which in turn includes lib/xxhash.c and its MODULE_LICENSE / MODULE_DESCRIPTION macros due to the STATIC definition. Split .modinfo out from ELF_DETAILS into its own macro and handle it in all vmlinux linker scripts. Discard .modinfo in the places where it was previously being discarded from being in COMMON_DISCARDS, as it has never been necessary in those uses. Cc: stable@vger.kernel.org Fixes:3e86e4d74c("kbuild: keep .modinfo section in vmlinux.unstripped") Reported-by: Ed W <lists@wildgooses.com> Closes: https://lore.kernel.org/587f25e0-a80e-46a5-9f01-87cb40cfa377@wildgooses.com/ [1] Tested-by: Ed W <lists@wildgooses.com> # x86_64 Link: https://patch.msgid.link/20260225-separate-modinfo-from-elf-details-v1-1-387ced6baf4b@kernel.org Signed-off-by: Nathan Chancellor <nathan@kernel.org>
110 lines
2.2 KiB
ArmAsm
110 lines
2.2 KiB
ArmAsm
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* OpenRISC vmlinux.lds.S
|
|
*
|
|
* Linux architectural port borrowing liberally from similar works of
|
|
* others. All original copyrights apply as per the original source
|
|
* declaration.
|
|
*
|
|
* Modifications for the OpenRISC architecture:
|
|
* Copyright (C) 2003 Matjaz Breskvar <phoenix@bsemi.com>
|
|
* Copyright (C) 2010-2011 Jonas Bonn <jonas@southpole.se>
|
|
*
|
|
* ld script for OpenRISC architecture
|
|
*/
|
|
|
|
/* TODO
|
|
* - clean up __offset & stuff
|
|
* - change all 8192 alignment to PAGE !!!
|
|
* - recheck if all alignments are really needed
|
|
*/
|
|
|
|
# define LOAD_OFFSET PAGE_OFFSET
|
|
# define LOAD_BASE PAGE_OFFSET
|
|
|
|
#include <asm/page.h>
|
|
#include <asm/cache.h>
|
|
#include <asm/thread_info.h>
|
|
#include <asm-generic/vmlinux.lds.h>
|
|
|
|
#ifdef __OR1K__
|
|
#define __OUTPUT_FORMAT "elf32-or1k"
|
|
#else
|
|
#define __OUTPUT_FORMAT "elf32-or32"
|
|
#endif
|
|
|
|
OUTPUT_FORMAT(__OUTPUT_FORMAT, __OUTPUT_FORMAT, __OUTPUT_FORMAT)
|
|
jiffies = jiffies_64 + 4;
|
|
|
|
SECTIONS
|
|
{
|
|
/* Read-only sections, merged into text segment: */
|
|
. = LOAD_BASE ;
|
|
|
|
_text = .;
|
|
|
|
/* _s_kernel_ro must be page aligned */
|
|
. = ALIGN(PAGE_SIZE);
|
|
_s_kernel_ro = .;
|
|
|
|
.text : AT(ADDR(.text) - LOAD_OFFSET)
|
|
{
|
|
_stext = .;
|
|
HEAD_TEXT
|
|
TEXT_TEXT
|
|
SCHED_TEXT
|
|
LOCK_TEXT
|
|
KPROBES_TEXT
|
|
IRQENTRY_TEXT
|
|
SOFTIRQENTRY_TEXT
|
|
*(.fixup)
|
|
*(.text.__*)
|
|
_etext = .;
|
|
}
|
|
/* TODO: Check if fixup and text.__* are really necessary
|
|
* fixup is definitely necessary
|
|
*/
|
|
|
|
_sdata = .;
|
|
|
|
/* Page alignment required for RO_DATA */
|
|
RO_DATA(PAGE_SIZE)
|
|
_e_kernel_ro = .;
|
|
|
|
/* Whatever comes after _e_kernel_ro had better be page-aligend, too */
|
|
|
|
/* 32 here is cacheline size... recheck this */
|
|
RW_DATA(32, PAGE_SIZE, PAGE_SIZE)
|
|
|
|
_edata = .;
|
|
|
|
EXCEPTION_TABLE(4)
|
|
|
|
/* Init code and data */
|
|
. = ALIGN(PAGE_SIZE);
|
|
__init_begin = .;
|
|
|
|
/* Page aligned */
|
|
INIT_TEXT_SECTION(PAGE_SIZE)
|
|
|
|
/* Align __setup_start on 16 byte boundary */
|
|
INIT_DATA_SECTION(16)
|
|
|
|
PERCPU_SECTION(L1_CACHE_BYTES)
|
|
|
|
__init_end = .;
|
|
|
|
BSS_SECTION(0, 0, 0x20)
|
|
|
|
_end = .;
|
|
|
|
/* Throw in the debugging sections */
|
|
STABS_DEBUG
|
|
DWARF_DEBUG
|
|
MODINFO
|
|
ELF_DETAILS
|
|
|
|
/* Sections to be discarded -- must be last */
|
|
DISCARDS
|
|
}
|