Commit 8b24ef44 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pstore-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull pstore fixes from Kees Cook:

 - Rate-limit ECC warnings (Dmitry Osipenko)

 - Fix error path check for NULL (Tetsuo Handa)

* tag 'pstore-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  pstore/ram: Rate-limit "uncorrectable error in header" message
  pstore: Fix warning in pstore_kill_sb()
parents 63dcd69d 7db688e9

fs/pstore/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ static struct dentry *pstore_mount(struct file_system_type *fs_type, 
static void pstore_kill_sb(struct super_block *sb)

{

	mutex_lock(&pstore_sb_lock);

	WARN_ON(pstore_sb != sb);

	WARN_ON(pstore_sb && pstore_sb != sb);



	kill_litter_super(sb);

	pstore_sb = NULL;

fs/pstore/ram_core.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static int persistent_ram_init_ecc(struct persistent_ram_zone *prz, 
		pr_info("error in header, %d\n", numerr);

		prz->corrected_bytes += numerr;

	} else if (numerr < 0) {

		pr_info("uncorrectable error in header\n");

		pr_info_ratelimited("uncorrectable error in header\n");

		prz->bad_blocks++;

	}