ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 04:33:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Pull pstore updates from Kees Cook:

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

 - Convert to platform remove callback returning void (Uwe Kleine-König)

* tag 'pstore-v6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  pstore/ram: Add check for kstrdup
  pstore/ram: Convert to platform remove callback returning void
This commit is contained in:
Linus Torvalds
2023-06-27 21:21:32 -07:00
parent d416a46c95 d97038d5ec
commit 8ad78685ff
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/pstore/ram.c
View File

@@ -875,7 +875,7 @@ fail_out:
return err; return err;
} }
static int ramoops_remove(struct platform_device *pdev) static void ramoops_remove(struct platform_device *pdev)
{ {
struct ramoops_context *cxt = &oops_cxt; struct ramoops_context *cxt = &oops_cxt;
@@ -885,8 +885,6 @@ static int ramoops_remove(struct platform_device *pdev)
cxt->pstore.bufsize = 0; cxt->pstore.bufsize = 0;
ramoops_free_przs(cxt); ramoops_free_przs(cxt);
return 0;
} }
static const struct of_device_id dt_match[] = { static const struct of_device_id dt_match[] = {
@@ -896,7 +894,7 @@ static const struct of_device_id dt_match[] = {
static struct platform_driver ramoops_driver = { static struct platform_driver ramoops_driver = {
.probe = ramoops_probe, .probe = ramoops_probe,
.remove = ramoops_remove, .remove_new = ramoops_remove,
.driver = { .driver = {
.name = "ramoops", .name = "ramoops",
.of_match_table = dt_match, .of_match_table = dt_match,

2
fs/pstore/ram_core.c
View File

@@ -599,6 +599,8 @@ struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size,
raw_spin_lock_init(&prz->buffer_lock); raw_spin_lock_init(&prz->buffer_lock);
prz->flags = flags; prz->flags = flags;
prz->label = kstrdup(label, GFP_KERNEL); prz->label = kstrdup(label, GFP_KERNEL);
if (!prz->label)
goto err;
ret = persistent_ram_buffer_map(start, size, prz, memtype); ret = persistent_ram_buffer_map(start, size, prz, memtype);
if (ret) if (ret)