Commit 300edd75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'objtool_urgent_for_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull objtool fix from Borislav Petkov:

 - Add a ORC format hash to vmlinux and modules in order for other tools
   which use it, to detect changes to it and adapt accordingly

* tag 'objtool_urgent_for_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/unwind/orc: Add ELF section with ORC version identifier
parents 661e723b b9f174c8

arch/x86/Makefile

+12 −0
Original line number Diff line number Diff line
@@ -305,6 +305,18 @@ ifeq ($(RETPOLINE_CFLAGS),) 
endif

endif



ifdef CONFIG_UNWINDER_ORC

orc_hash_h := arch/$(SRCARCH)/include/generated/asm/orc_hash.h

orc_hash_sh := $(srctree)/scripts/orc_hash.sh

targets += $(orc_hash_h)

quiet_cmd_orc_hash = GEN     $@

      cmd_orc_hash = mkdir -p $(dir $@); \

		     $(CONFIG_SHELL) $(orc_hash_sh) < $< > $@

$(orc_hash_h): $(srctree)/arch/x86/include/asm/orc_types.h $(orc_hash_sh) FORCE

	$(call if_changed,orc_hash)

archprepare: $(orc_hash_h)

endif



archclean:

	$(Q)rm -rf $(objtree)/arch/i386

	$(Q)rm -rf $(objtree)/arch/x86_64

arch/x86/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0





generated-y += orc_hash.h

generated-y += syscalls_32.h

generated-y += syscalls_64.h

generated-y += syscalls_x32.h

arch/x86/include/asm/orc_header.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/* Copyright (c) Meta Platforms, Inc. and affiliates. */



#ifndef _ORC_HEADER_H

#define _ORC_HEADER_H



#include <linux/types.h>

#include <linux/compiler.h>

#include <asm/orc_hash.h>



/*

 * The header is currently a 20-byte hash of the ORC entry definition; see

 * scripts/orc_hash.sh.

 */

#define ORC_HEADER					\

	__used __section(".orc_header") __aligned(4)	\

	static const u8 orc_header[] = { ORC_HASH }



#endif /* _ORC_HEADER_H */

arch/x86/kernel/unwind_orc.c

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ 
#include <asm/unwind.h>

#include <asm/orc_types.h>

#include <asm/orc_lookup.h>

#include <asm/orc_header.h>



ORC_HEADER;



#define orc_warn(fmt, ...) \

	printk_deferred_once(KERN_WARNING "WARNING: " fmt, ##__VA_ARGS__)

include/asm-generic/vmlinux.lds.h

+3 −0
Original line number Diff line number Diff line
@@ -839,6 +839,9 @@ 


#ifdef CONFIG_UNWINDER_ORC

#define ORC_UNWIND_TABLE						\

	.orc_header : AT(ADDR(.orc_header) - LOAD_OFFSET) {		\

		BOUNDED_SECTION_BY(.orc_header, _orc_header)		\

	}								\

	. = ALIGN(4);							\

	.orc_unwind_ip : AT(ADDR(.orc_unwind_ip) - LOAD_OFFSET) {	\

		BOUNDED_SECTION_BY(.orc_unwind_ip, _orc_unwind_ip)	\