|
 |
6e196a |
From 04a8baf87820d8a13926e0b8db5cfa55f9f04420 Mon Sep 17 00:00:00 2001
|
|
|
6e196a |
From: Vojtech Trefny <vtrefny@redhat.com>
|
|
|
6e196a |
Date: Fri, 25 Sep 2020 14:26:57 +0200
|
|
|
6e196a |
Subject: [PATCH 1/2] mdraid: Fix copy-paste error when checking return value
|
|
|
6e196a |
|
|
|
6e196a |
---
|
|
|
6e196a |
src/plugins/mdraid.c | 2 +-
|
|
|
6e196a |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
6e196a |
|
|
|
6e196a |
diff --git a/src/plugins/mdraid.c b/src/plugins/mdraid.c
|
|
|
6e196a |
index 67bdc1f9..48abb72f 100644
|
|
|
6e196a |
--- a/src/plugins/mdraid.c
|
|
|
6e196a |
+++ b/src/plugins/mdraid.c
|
|
|
6e196a |
@@ -995,7 +995,7 @@ BDMDExamineData* bd_md_examine (const gchar *device, GError **error) {
|
|
|
6e196a |
orig_data = ret->dev_uuid;
|
|
|
6e196a |
if (orig_data) {
|
|
|
6e196a |
ret->dev_uuid = bd_md_canonicalize_uuid (orig_data, error);
|
|
|
6e196a |
- if (!ret->uuid) {
|
|
|
6e196a |
+ if (!ret->dev_uuid) {
|
|
|
6e196a |
g_prefix_error (error, "Failed to canonicalize MD UUID '%s': ", orig_data);
|
|
|
6e196a |
g_free (orig_data);
|
|
|
6e196a |
bd_md_examine_data_free (ret);
|
|
|
6e196a |
--
|
|
|
6e196a |
2.37.1
|
|
|
6e196a |
|
|
|
6e196a |
|
|
|
6e196a |
From 16a34bc5ddb19bc6dd1a845d87e8b748cbaedd2c Mon Sep 17 00:00:00 2001
|
|
|
6e196a |
From: Vojtech Trefny <vtrefny@redhat.com>
|
|
|
6e196a |
Date: Fri, 25 Sep 2020 14:41:20 +0200
|
|
|
6e196a |
Subject: [PATCH 2/2] mdraid: Fix use after free
|
|
|
6e196a |
|
|
|
6e196a |
Another copy-paste error.
|
|
|
6e196a |
---
|
|
|
6e196a |
src/plugins/mdraid.c | 3 +--
|
|
|
6e196a |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
6e196a |
|
|
|
6e196a |
diff --git a/src/plugins/mdraid.c b/src/plugins/mdraid.c
|
|
|
6e196a |
index 48abb72f..75143ea7 100644
|
|
|
6e196a |
--- a/src/plugins/mdraid.c
|
|
|
6e196a |
+++ b/src/plugins/mdraid.c
|
|
|
6e196a |
@@ -1028,8 +1028,7 @@ BDMDExamineData* bd_md_examine (const gchar *device, GError **error) {
|
|
|
6e196a |
value++;
|
|
|
6e196a |
ret->uuid = bd_md_canonicalize_uuid (value, error);
|
|
|
6e196a |
if (!ret->uuid) {
|
|
|
6e196a |
- g_prefix_error (error, "Failed to canonicalize MD UUID '%s': ", orig_data);
|
|
|
6e196a |
- g_free (orig_data);
|
|
|
6e196a |
+ g_prefix_error (error, "Failed to canonicalize MD UUID '%s': ", value);
|
|
|
6e196a |
bd_md_examine_data_free (ret);
|
|
|
6e196a |
g_strfreev (output_fields);
|
|
|
6e196a |
return NULL;
|
|
|
6e196a |
--
|
|
|
6e196a |
2.37.1
|
|
|
6e196a |
|