Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cc499b3 authored Jul 14, 2016 by Linus Torvalds

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull core fixes from Ingo Molnar:
 "Fix an objtool false positive plus an UP kernel memory corruption bug
  on certain configs"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpu/hotplug: Keep enough storage space if SMP=n to avoid array out of bounds scribble
  objtool: Fix STACK_FRAME_NON_STANDARD macro checking for function symbols

parents cf875cc1 a7c73414

kernel/cpu.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1201,6 +1201,8 @@ static struct cpuhp_step cpuhp_bp_states[] = {
	.teardown = takedown_cpu,		.teardown = takedown_cpu,
	.cant_stop = true,		.cant_stop = true,
	},		},
			#else
			[CPUHP_BRINGUP_CPU] = { },
	#endif		#endif
	};		};

tools/objtool/builtin-check.c

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -122,10 +122,14 @@ static bool ignore_func(struct objtool_file file, struct symbol func)

	/* check for STACK_FRAME_NON_STANDARD */		/* check for STACK_FRAME_NON_STANDARD */
	if (file->whitelist && file->whitelist->rela)		if (file->whitelist && file->whitelist->rela)
	list_for_each_entry(rela, &file->whitelist->rela->rela_list, list)		list_for_each_entry(rela, &file->whitelist->rela->rela_list, list) {
	if (rela->sym->sec == func->sec &&		if (rela->sym->type == STT_SECTION &&
			rela->sym->sec == func->sec &&
	rela->addend == func->offset)		rela->addend == func->offset)
	return true;		return true;
			if (rela->sym->type == STT_FUNC && rela->sym == func)
			return true;
			}

	/* check if it has a context switching instruction */		/* check if it has a context switching instruction */
	func_for_each_insn(file, func, insn)		func_for_each_insn(file, func, insn)