summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Stefani <luca@osomprivacy.com>2022-12-22 14:10:49 +0100
committerKees Cook <keescook@chromium.org>2022-12-23 10:34:25 -0800
commitbeca3e311a49cd3c55a056096531737d7afa4361 (patch)
tree8a921d440f1fcb64f4caeef3414c43e590f84729
parent2f4fec5943407318b9523f01ce1f5d668c028332 (diff)
pstore: Properly assign mem_type property
If mem-type is specified in the device tree it would end up overriding the record_size field instead of populating mem_type. As record_size is currently parsed after the improper assignment with default size 0 it continued to work as expected regardless of the value found in the device tree. Simply changing the target field of the struct is enough to get mem-type working as expected. Fixes: 9d843e8fafc7 ("pstore: Add mem_type property DT parsing support") Cc: stable@vger.kernel.org Signed-off-by: Luca Stefani <luca@osomprivacy.com> Signed-off-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20221222131049.286288-1-luca@osomprivacy.com
-rw-r--r--fs/pstore/ram.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 9a5052431fd3..ade66dbe5f39 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -680,7 +680,7 @@ static int ramoops_parse_dt(struct platform_device *pdev,
field = value; \
}
- parse_u32("mem-type", pdata->record_size, pdata->mem_type);
+ parse_u32("mem-type", pdata->mem_type, pdata->mem_type);
parse_u32("record-size", pdata->record_size, 0);
parse_u32("console-size", pdata->console_size, 0);
parse_u32("ftrace-size", pdata->ftrace_size, 0);