Skip to content

Commit

Permalink
Merge tag 'trace-v5.17-2' of git://git.kernel.org/pub/scm/linux/kerne…
Browse files Browse the repository at this point in the history
…l/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
  • Loading branch information
Linus Torvalds committed Jan 19, 2022
2 parents f1b744f + 35140d3 commit e9f5cbc
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions scripts/sorttable.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit e9f5cbc

Please sign in to comment.