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

8050258b · Linus Torvalds <[email protected]> · 2024-07-16 13:35:07 -07:00

Pull pstore updates from Kees Cook:

 - Add missing MODULE_DESCRIPTION() macro (Jeff Johnson)

 - Replace deprecated strncpy() with strscpy() (Justin Stitt)

* tag 'pstore-v6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  pstore: platform: add missing MODULE_DESCRIPTION() macro
  pstore/blk: replace deprecated strncpy with strscpy

Commit: 8050258bd1eed0f77dd7e3fa15feb23bbcc38e63
Parents: 1ca995ed · 9b3c13c9

Merge commit. Changes below are compared with the first parent: 1ca995ed.

Changes

2 files changed · +2 −1

File	Status	Add	Del	Content
fs/pstore/blk.c	modified	+1	−1	View file
fs/pstore/platform.c	modified	+1	−0	View file

fs/pstore/blk.c

View file

diff --git a/fs/pstore/blk.c b/fs/pstore/blk.c
index de8cf5d..65b2473 100644
--- a/fs/pstore/blk.c
+++ b/fs/pstore/blk.c
@@ -241,7 +241,7 @@ err:
 /* get information of pstore/blk */
 int pstore_blk_get_config(struct pstore_blk_config *info)
 {
-	strncpy(info->device, blkdev, 80);
+	strscpy(info->device, blkdev);
 	info->max_reason = max_reason;
 	info->kmsg_size = check_size(kmsg_size, 4096);
 	info->pmsg_size = check_size(pmsg_size, 4096);

fs/pstore/platform.c

View file

diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 0342592..3497ede 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -761,4 +761,5 @@ static void __exit pstore_exit(void)
 module_exit(pstore_exit)
 
 MODULE_AUTHOR("Tony Luck <[email protected]>");
+MODULE_DESCRIPTION("Persistent Storage - platform driver interface");
 MODULE_LICENSE("GPL");