Commit 8050258b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1ca995ed 9b3c13c9

fs/pstore/blk.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static int __register_pstore_blk(struct pstore_device_info *dev, 
/* 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

+1 −0
Original line number Diff line number Diff line
@@ -761,4 +761,5 @@ static void __exit pstore_exit(void) 
module_exit(pstore_exit)



MODULE_AUTHOR("Tony Luck <tony.luck@intel.com>");

MODULE_DESCRIPTION("Persistent Storage - platform driver interface");

MODULE_LICENSE("GPL");