Commit e9f5cbc0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-v5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace 

Pull tracing fix from Steven Rostedt:
 "tracing/scripts: Possible uninitialized variable

  The 0day bot discovered a possible uninitialized path in the scripts
  that sort the mcount sections at build time. Just needed to initialize
  that variable"

* tag 'trace-v5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  script/sorttable: Fix some initialization problems
parents f1b744f6 35140d39

scripts/sorttable.h

+3 −2
Original line number Diff line number Diff line
@@ -199,6 +199,8 @@ static int compare_extable(const void *a, const void *b) 
	return 0;

}

#ifdef MCOUNT_SORT_ENABLED

pthread_t mcount_sort_thread;



struct elf_mcount_loc {

	Elf_Ehdr *ehdr;

	Elf_Shdr *init_data_sec;
@@ -282,10 +284,9 @@ static int do_sort(Elf_Ehdr *ehdr, 
	unsigned int shnum;

	unsigned int shstrndx;

#ifdef MCOUNT_SORT_ENABLED

	struct elf_mcount_loc mstruct;

	struct elf_mcount_loc mstruct = {0};

	uint_t _start_mcount_loc = 0;

	uint_t _stop_mcount_loc = 0;

	pthread_t mcount_sort_thread;

#endif

#if defined(SORTTABLE_64) && defined(UNWINDER_ORC_ENABLED)

	unsigned int orc_ip_size = 0;