Commit 2b369478 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pstore-v4.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull pstore fix from Kees Cook:
 "Fix pstore regression (boot Oops) when ftrace disabled, from Brian
  Norris"

* tag 'pstore-v4.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  pstore: don't OOPS when there are no ftrace zones
parents 99378fd2 8672aed7

fs/pstore/ram.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type, 
					   1, id, type, PSTORE_TYPE_PMSG, 0);



	/* ftrace is last since it may want to dynamically allocate memory. */

	if (!prz_ok(prz)) {

	if (!prz_ok(prz) && cxt->fprzs) {

		if (!(cxt->flags & RAMOOPS_FLAG_FTRACE_PER_CPU)) {

			prz = ramoops_get_next_prz(cxt->fprzs,

					&cxt->ftrace_read_cnt, 1, id, type,

CRA Git | Maintained and supported by SUSTech CRA and CCSE