mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

pstore updates for v6.7-rc1 

- Check for out-of-memory condition during initialization (Jiasheng Jiang)
 
 - Fix documentation typos (Tudor Ambarus)
 -----BEGIN PGP SIGNATURE-----
 
 iQJKBAABCgA0FiEEpcP2jyKd1g9yPm4TiXL039xtwCYFAmU/4ioWHGtlZXNjb29r
 QGNocm9taXVtLm9yZwAKCRCJcvTf3G3AJuPsD/kBcJPVzn4zx3sx6LJZJL4d9/4M
 xQ22mJM5H/z1L9YY7PrxD8lDcpue7EJmr8/Q7tdcUHNjzSxgecfuSR9Eq1Apcmra
 RbQGv7B/VmbU8aPMr5k+XiIzGU9Evoj6aZLGB3bL+3uj9Xmadkrz6SvctJy0zcRg
 D5VpLkXLx1JzShVfplYQtmSIRUg3gcn9BbwbZTWgD4lVZD7UNx624xUBH7ywYxCB
 +qXKW+DvFiZAUszAGXSBWcPdx4pue0Ff0Q52ZnHjEdYOrlPC6dVQ1ABMDnWrNCVh
 58i7dtREEX+IX50xtjsNkVU+DaunAP7VI0+/+fgDk8KLCYfh7dTXN0fOgSlHILnt
 zJx5qTkBh/A/g+3X21L5srq1qAwR7V3tBIQPQAlyBcJCneYHLaQSynsMynydrJaH
 nYbpWeINhXP/ZfDFA7bVum+uBMrz1stIuEWeL1pELTk7NUVkHtkmr14Af1+zNz0z
 GeKBrPebBhg9lbCPAmV8VT08vJJ+8tD/WA7fIfNLH7/LdYgl+tRFVs/c6yKDfmu9
 p6wt5eCKVszg1jFYj/QMOBfOR5g2koectdO8qu4LI6PcW2hOTneCw1RLtwdUpFol
 2HNXl+L69KVnhLNlKSAnRhPTfpcDb16ssFMQuVNWTXYS8rKW7J/+Mh9RYUbEzYaH
 Ftzs99LnZ+orxNvy+Q==
 =e8WJ
 -----END PGP SIGNATURE-----

Merge tag 'pstore-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull pstore updates from Kees Cook:

 - Check for out-of-memory condition during initialization (Jiasheng
   Jiang)

 - Fix documentation typos (Tudor Ambarus)

* tag 'pstore-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  pstore/platform: Add check for kstrdup
  docs: pstore-blk.rst: fix typo, s/console/ftrace
  docs: pstore-blk.rst: use "about" as a preposition after "care"
This commit is contained in:
Linus Torvalds 2023-10-30 19:26:39 -10:00
parent befaa609f4 a19d48f7c5
commit 5e37269945
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/admin-guide/pstore-blk.rst
View File

@ -76,7 +76,7 @@ kmsg_size
~~~~~~~~~
The chunk size in KB for oops/panic front-end. It **MUST** be a multiple of 4.
It's optional if you do not care oops/panic log.
It's optional if you do not care about the oops/panic log.
There are multiple chunks for oops/panic front-end depending on the remaining
space except other pstore front-ends.
@ -88,7 +88,7 @@ pmsg_size
~~~~~~~~~
The chunk size in KB for pmsg front-end. It **MUST** be a multiple of 4.
It's optional if you do not care pmsg log.
It's optional if you do not care about the pmsg log.
Unlike oops/panic front-end, there is only one chunk for pmsg front-end.
@ -100,7 +100,7 @@ console_size
~~~~~~~~~~~~
The chunk size in KB for console front-end. It **MUST** be a multiple of 4.
It's optional if you do not care console log.
It's optional if you do not care about the console log.
Similar to pmsg front-end, there is only one chunk for console front-end.
@ -111,7 +111,7 @@ ftrace_size
~~~~~~~~~~~
The chunk size in KB for ftrace front-end. It **MUST** be a multiple of 4.
It's optional if you do not care console log.
It's optional if you do not care about the ftrace log.
Similar to oops front-end, there are multiple chunks for ftrace front-end
depending on the count of cpu processors. Each chunk size is equal to

9
fs/pstore/platform.c
View File

@ -464,6 +464,8 @@ out:
*/
int pstore_register(struct pstore_info *psi)
{
char *new_backend;
if (backend && strcmp(backend, psi->name)) {
pr_warn("backend '%s' already in use: ignoring '%s'\n",
backend, psi->name);
@ -484,11 +486,16 @@ int pstore_register(struct pstore_info *psi)
return -EINVAL;
}
new_backend = kstrdup(psi->name, GFP_KERNEL);
if (!new_backend)
return -ENOMEM;
mutex_lock(&psinfo_lock);
if (psinfo) {
pr_warn("backend '%s' already loaded: ignoring '%s'\n",
psinfo->name, psi->name);
mutex_unlock(&psinfo_lock);
kfree(new_backend);
return -EBUSY;
}
@ -521,7 +528,7 @@ int pstore_register(struct pstore_info *psi)
* Update the module parameter backend, so it is visible
* through /sys/module/pstore/parameters/backend
*/
backend = kstrdup(psi->name, GFP_KERNEL);
backend = new_backend;
pr_info("Registered %s as persistent store backend\n", psi->name);