diff options
Diffstat (limited to 'kernel/early_res.c')
-rw-r--r-- | kernel/early_res.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/kernel/early_res.c b/kernel/early_res.c index 9ab11cd84853..3cb2c661bb78 100644 --- a/kernel/early_res.c +++ b/kernel/early_res.c | |||
@@ -79,9 +79,19 @@ static void __init drop_range_partial(int i, u64 start, u64 end) | |||
79 | /* make head segment */ | 79 | /* make head segment */ |
80 | early_res[i].end = common_start; | 80 | early_res[i].end = common_start; |
81 | if (old_end > common_end) { | 81 | if (old_end > common_end) { |
82 | char name[15]; | ||
83 | |||
84 | /* | ||
85 | * Save a local copy of the name, since the | ||
86 | * early_res array could get resized inside | ||
87 | * reserve_early_without_check() -> | ||
88 | * __check_and_double_early_res(), which would | ||
89 | * make the current name pointer invalid. | ||
90 | */ | ||
91 | strncpy(name, early_res[i].name, | ||
92 | sizeof(early_res[i].name) - 1); | ||
82 | /* add another for left over on tail */ | 93 | /* add another for left over on tail */ |
83 | reserve_early_without_check(common_end, old_end, | 94 | reserve_early_without_check(common_end, old_end, name); |
84 | early_res[i].name); | ||
85 | } | 95 | } |
86 | return; | 96 | return; |
87 | } else { | 97 | } else { |