Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-20 06:53:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update crash_reserve.c

Browse Source 
- Typo Fix: Corrected the typo in the error message for the @ character check.

- Consistent Error Messages: Added more descriptive and consistent error messages.

- Dead Loop Prevention: Added a retry counter with a maximum limit to prevent infinite loops during memory reservation retries.

- Resource Management: Ensured that resources are cleaned up properly on error paths to avoid memory leaks and other issues.
This commit is contained in:
Yaimsputnik 2024-09-03 20:06:33 -04:00 committed by GitHub
parent 88fac17500
commit 7344c311f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/crash_reserve.c
View File

@ -86,7 +86,7 @@ static int __init parse_crashkernel_mem(char *cmdline,
} }
cur++; cur++;
/* if no ':' is here, than we read the end */ /* if no ':' is here, then we read the end */
if (*cur != ':') { if (*cur != ':') {
end = memparse(cur, &tmp); end = memparse(cur, &tmp);
if (cur == tmp) { if (cur == tmp) {
@ -131,12 +131,13 @@ static int __init parse_crashkernel_mem(char *cmdline,
cur++; cur++;
*crash_base = memparse(cur, &tmp); *crash_base = memparse(cur, &tmp);
if (cur == tmp) { if (cur == tmp) {
pr_warn("crahskernel: Memory value expected after '@'\n"); pr_warn("crashkernel: Memory value expected after '@'\n"); // Fixed typo
return -EINVAL; return -EINVAL;
} }
} }
} else } else {
pr_info("crashkernel size resulted in zero bytes\n"); pr_info("crashkernel size resulted in zero bytes\n");
}
return 0; return 0;
} }
@ -180,7 +181,7 @@ static __initdata char *suffix_tbl[] = {
}; };
/* /*
* That function parses "suffix" crashkernel command lines like * That function parses "suffix" crashkernel command lines like
* *
* crashkernel=size,[high|low] * crashkernel=size,[high|low]
* *
@ -332,8 +333,10 @@ int __init parse_crashkernel(char *cmdline,
*high = true; *high = true;
} }
#endif #endif
if (!*crash_size) if (!*crash_size) {
pr_warn("crashkernel: calculated crash size is zero\n");
ret = -EINVAL; ret = -EINVAL;
}
return ret; return ret;
} }
@ -380,6 +383,8 @@ void __init reserve_crashkernel_generic(char *cmdline,
{ {
unsigned long long search_end = CRASH_ADDR_LOW_MAX, search_base = 0; unsigned long long search_end = CRASH_ADDR_LOW_MAX, search_base = 0;
bool fixed_base = false; bool fixed_base = false;
int retry_count = 0;
const int max_retries = 5; // To prevent infinite loops
/* User specifies base address explicitly. */ /* User specifies base address explicitly. */
if (crash_base) { if (crash_base) {
@ -395,6 +400,11 @@ retry:
crash_base = memblock_phys_alloc_range(crash_size, CRASH_ALIGN, crash_base = memblock_phys_alloc_range(crash_size, CRASH_ALIGN,
search_base, search_end); search_base, search_end);
if (!crash_base) { if (!crash_base) {
if (retry_count++ >= max_retries) {
pr_warn("crashkernel reservation failed after maximum retries.\n");
return;
}
/* /*
* For crashkernel=size[KMG]@offset[KMG], print out failure * For crashkernel=size[KMG]@offset[KMG], print out failure
* message if can't reserve the specified region. * message if can't reserve the specified region.