diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-16 13:35:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-16 13:35:07 -0700 |
| commit | 8050258bd1eed0f77dd7e3fa15feb23bbcc38e63 (patch) | |
| tree | 27a9a63136f243b65df5dbd13039fa85e18a414a | |
| parent | 1ca995edf838a70c7c0aba2de7fc6da57e22cbf3 (diff) | |
| parent | 9b3c13c9ea4ecb2b95948f666560b8df8f358b40 (diff) | |
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
| -rw-r--r-- | fs/pstore/blk.c | 2 | ||||
| -rw-r--r-- | fs/pstore/platform.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/pstore/blk.c b/fs/pstore/blk.c index de8cf5d75f34..65b2473e22ff 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); diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 03425928d2fb..3497ede88aa0 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 <tony.luck@intel.com>"); +MODULE_DESCRIPTION("Persistent Storage - platform driver interface"); MODULE_LICENSE("GPL"); |