pstore: Avoid writing records with zero size

Sometimes pstore_console_write() will write records with zero size
to persistent ram zone, which is unnecessary. It will only increase
resource consumption. Also adjust ramoops_write_kmsg_hdr() to have
same logic if memory allocation fails.

Signed-off-by: Yue Hu <huyue2@yulong.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
fourteen
Yue Hu 6 years ago committed by Jenna
parent a257759853
commit d945505acb
  1. 3
      fs/pstore/platform.c
  2. 6
      fs/pstore/ram.c

@ -600,6 +600,9 @@ static void pstore_console_write(struct console *con, const char *s, unsigned c)
{
struct pstore_record record;
if (!c)
return;
pstore_record_init(&record, psinfo);
record.type = PSTORE_TYPE_CONSOLE;

@ -364,8 +364,10 @@ static size_t ramoops_write_kmsg_hdr(struct persistent_ram_zone *prz,
record->time.tv_sec,
record->time.tv_nsec / 1000,
record->compressed ? 'C' : 'D');
WARN_ON_ONCE(!hdr);
len = hdr ? strlen(hdr) : 0;
if (WARN_ON_ONCE(!hdr))
return 0;
len = strlen(hdr);
persistent_ram_write(prz, hdr, len);
kfree(hdr);

Loading…
Cancel
Save