mirror of https://gitee.com/openkylin/linux.git
pstore updates
- Improve failure paths (chenqiwu) - Fix ftrace position index (Vasily Averin) - Use proper flexible-array member (Gustavo A. R. Silva) -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEEpcP2jyKd1g9yPm4TiXL039xtwCYFAl6Bc00WHGtlZXNjb29r QGNocm9taXVtLm9yZwAKCRCJcvTf3G3AJvUOEACudEIGbwcMkBOtWOlEDGMzMx1q 4NMOuewTCAUYVw7JqAuXhilVbATbxX3r46wah3qoF786/94tNTL//43WuhjSHL+W 6aBpL42vm4i3NNPw9nHNU6bSDiXsdQRLg0pTrQHQDUzlpR63PrgoVUiyxwS5Hoaq Php2qyLT4gtWi6zMxFJtLAuzJ5ye24odr4jep/BdGifUY5NfMXPbnhqij/3YTLTV B0XjgCCn3a/WyXnV9iKBacHVbp9qMHfY9BHKvIhmaOFR7Ef6TOW/Q1QgO2mOMJnY mD8w9Usz9+DGxXzZJRPHTn2Pd0kelMONIq5Tbt0va617KgWiyAxMlXZHiu+ZSMWj rI4piMUP1aP2+bCm0ST9FpP8lMoDmI/Wl2GtgUwxdbdMF+tbLFMLd8Y+xLIu0WSR TCkzCtnM/3zU4dPeOoptiIxWYyyoy2RXEThmeOBnibOZkNstcaVY03rogahW/H6Z m97cKMnMoVrEVFSEZCzwHuWTaJ6LTUT4lXz2X8VN3Yro994qcQut0R1IChyCA0t6 SgzvspbzBxHoIPxw03Ef82D5fAiWgTsdQ2lfkUy2j6zeJS5S9o4kuAjTBFDnnDfv kqOTDy0CxzDp0nB2x6cjSxVCxxOxZUVXglQj8X0hLIi/smu3zTxBGZSoZ8BA+6xt mY5bx6opEG/Oteg73Q== =g7H5 -----END PGP SIGNATURE----- Merge tag 'pstore-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux Pull pstore updates from Kees Cook: "These mostly some minor cleanups and a bug fix for an ftrace corner case: - Improve failure paths (chenqiwu) - Fix ftrace position index (Vasily Averin) - Use proper flexible-array member (Gustavo A. R. Silva)" * tag 'pstore-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: pstore/ram: Replace zero-length array with flexible-array member pstore: pstore_ftrace_seq_next should increase position index pstore/ram: remove unnecessary ramoops_unregister_dummy() pstore/platform: fix potential mem leak if pstore_init_fs failed
This commit is contained in:
commit
c271bdbf38
|
@ -87,11 +87,11 @@ static void *pstore_ftrace_seq_next(struct seq_file *s, void *v, loff_t *pos)
|
|||
struct pstore_private *ps = s->private;
|
||||
struct pstore_ftrace_seq_data *data = v;
|
||||
|
||||
(*pos)++;
|
||||
data->off += REC_SIZE;
|
||||
if (data->off + REC_SIZE > ps->total_size)
|
||||
return NULL;
|
||||
|
||||
(*pos)++;
|
||||
return data;
|
||||
}
|
||||
|
||||
|
@ -101,6 +101,9 @@ static int pstore_ftrace_seq_show(struct seq_file *s, void *v)
|
|||
struct pstore_ftrace_seq_data *data = v;
|
||||
struct pstore_ftrace_record *rec;
|
||||
|
||||
if (!data)
|
||||
return 0;
|
||||
|
||||
rec = (struct pstore_ftrace_record *)(ps->record->buf + data->off);
|
||||
|
||||
seq_printf(s, "CPU:%d ts:%llu %08lx %08lx %ps <- %pS\n",
|
||||
|
|
|
@ -823,9 +823,9 @@ static int __init pstore_init(void)
|
|||
|
||||
ret = pstore_init_fs();
|
||||
if (ret)
|
||||
return ret;
|
||||
free_buf_for_compression();
|
||||
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
late_initcall(pstore_init);
|
||||
|
||||
|
|
|
@ -963,7 +963,6 @@ static void __init ramoops_register_dummy(void)
|
|||
pr_info("could not create platform device: %ld\n",
|
||||
PTR_ERR(dummy));
|
||||
dummy = NULL;
|
||||
ramoops_unregister_dummy();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ struct persistent_ram_buffer {
|
|||
uint32_t sig;
|
||||
atomic_t start;
|
||||
atomic_t size;
|
||||
uint8_t data[0];
|
||||
uint8_t data[];
|
||||
};
|
||||
|
||||
#define PERSISTENT_RAM_SIG (0x43474244) /* DBGC */
|
||||
|
|
Loading…
Reference in New Issue