3117d284d2
- Update to 14 plus upstream fixes. (fate#322108) - Forward port and refresh SLE patches OBS-URL: https://build.opensuse.org/request/show/477131 OBS-URL: https://build.opensuse.org/package/show/Base:System/efibootmgr?expand=0&rev=37
85 lines
3.0 KiB
Diff
85 lines
3.0 KiB
Diff
From d89633f608177283e9ae0f16c7065768e64da0ca Mon Sep 17 00:00:00 2001
|
|
From: Raymund Will <rw@suse.com>
|
|
Date: Mon, 13 Feb 2017 15:33:52 +0100
|
|
Subject: [PATCH] efibootmgr: sanitize `set/get_mirror()`
|
|
References: bsc#987599
|
|
|
|
get_mirror()
|
|
- don't short-circuit the assignment of values in case of version mismatch
|
|
as `show_mirror()` happily tries to use them nevertheless
|
|
- move redundant warning (from `show_mirror()`s PoV) to `set_mirror()`
|
|
- add missing `free(data)`
|
|
|
|
set_mirror()
|
|
- skip obsolete second assignment of `data`
|
|
- avoid potentially "uninitialized" access to `above/below4g` by protecting
|
|
it with `opts.set_mirror_hi/_lo` respectively, thus simplifying the code
|
|
down the line
|
|
Note: this will prevent unnecessary write-operations!
|
|
|
|
Signed-off-by: Raymund Will <rw@suse.com>
|
|
---
|
|
src/efibootmgr.c | 25 +++++++++++++++----------
|
|
1 file changed, 15 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/src/efibootmgr.c b/src/efibootmgr.c
|
|
index 20d71e2..15659c6 100644
|
|
--- a/src/efibootmgr.c
|
|
+++ b/src/efibootmgr.c
|
|
@@ -1106,12 +1106,12 @@ get_mirror(int which, int *below4g, int *above4g, int *mirrorstatus)
|
|
if (rc == 0) {
|
|
abm = (ADDRESS_RANGE_MIRROR_VARIABLE_DATA *)data;
|
|
if (!which && abm->mirror_version != MIRROR_VERSION) {
|
|
- warningx("** Warning ** : unrecognised version for memory mirror i/f");
|
|
- return 2;
|
|
+ rc = 2;
|
|
}
|
|
*below4g = abm->mirror_memory_below_4gb;
|
|
*above4g = abm->mirror_amount_above_4gb;
|
|
*mirrorstatus = abm->mirror_status;
|
|
+ free(data);
|
|
} else {
|
|
cond_warning(opts.verbose >= 2,
|
|
"Could not read variable '%s'", name);
|
|
@@ -1130,14 +1130,19 @@ set_mirror(int below4g, int above4g)
|
|
uint32_t attributes;
|
|
int oldbelow4g, oldabove4g;
|
|
|
|
- if ((s = get_mirror(0, &oldbelow4g, &oldabove4g, &status)) == 0) {
|
|
- if (oldbelow4g == below4g && oldabove4g == above4g)
|
|
- return 0;
|
|
- } else {
|
|
- warningx("** Warning ** : platform does not support memory mirror");
|
|
+ if ((s = get_mirror(0, &oldbelow4g, &oldabove4g, &status)) != 0) {
|
|
+ if (s == 2)
|
|
+ warningx("** Warning ** : unrecognised version for memory mirror i/f");
|
|
+ else
|
|
+ warningx("** Warning ** : platform does not support memory mirror");
|
|
return s;
|
|
}
|
|
|
|
+ below4g = opts.set_mirror_lo ? below4g : oldbelow4g;
|
|
+ above4g = opts.set_mirror_hi ? above4g : oldabove4g;
|
|
+ if (oldbelow4g == below4g && oldabove4g == above4g)
|
|
+ return 0;
|
|
+
|
|
data = (uint8_t *)&abm;
|
|
data_size = sizeof (abm);
|
|
attributes = EFI_VARIABLE_NON_VOLATILE
|
|
@@ -1145,10 +1151,9 @@ set_mirror(int below4g, int above4g)
|
|
| EFI_VARIABLE_RUNTIME_ACCESS;
|
|
|
|
abm.mirror_version = MIRROR_VERSION;
|
|
- abm.mirror_amount_above_4gb = opts.set_mirror_hi ? above4g : oldabove4g;
|
|
- abm.mirror_memory_below_4gb = opts.set_mirror_lo ? below4g : oldbelow4g;
|
|
+ abm.mirror_amount_above_4gb = above4g;
|
|
+ abm.mirror_memory_below_4gb = below4g;
|
|
abm.mirror_status = 0;
|
|
- data = (uint8_t *)&abm;
|
|
rc = efi_set_variable(ADDRESS_RANGE_MIRROR_VARIABLE_GUID,
|
|
ADDRESS_RANGE_MIRROR_VARIABLE_REQUEST, data,
|
|
data_size, attributes, 0644);
|
|
--
|
|
2.6.6
|
|
|