Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 8050258

Browse files
committed
Merge tag 'pstore-v6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
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
2 parents 1ca995e + 9b3c13c commit 8050258

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

fs/pstore/blk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ static int __register_pstore_blk(struct pstore_device_info *dev,
241241
/* get information of pstore/blk */
242242
int pstore_blk_get_config(struct pstore_blk_config *info)
243243
{
244-
strncpy(info->device, blkdev, 80);
244+
strscpy(info->device, blkdev);
245245
info->max_reason = max_reason;
246246
info->kmsg_size = check_size(kmsg_size, 4096);
247247
info->pmsg_size = check_size(pmsg_size, 4096);

fs/pstore/platform.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,4 +761,5 @@ static void __exit pstore_exit(void)
761761
module_exit(pstore_exit)
762762

763763
MODULE_AUTHOR("Tony Luck <tony.luck@intel.com>");
764+
MODULE_DESCRIPTION("Persistent Storage - platform driver interface");
764765
MODULE_LICENSE("GPL");

0 commit comments

Comments
 (0)