|
 |
360320 |
From 47dd191ab5c48932df4c0c219fca19fcedba6cd2 Mon Sep 17 00:00:00 2001
|
|
|
360320 |
From: rpm-build <rpm-build>
|
|
|
360320 |
Date: Thu, 2 Jun 2022 11:37:20 -0700
|
|
|
360320 |
Subject: [PATCH 1/1] fix libiscsi firmware discovery issue with NULL drec
|
|
|
360320 |
argument
|
|
|
360320 |
|
|
|
360320 |
---
|
|
|
360320 |
libiscsi/libiscsi.c | 2 +-
|
|
|
360320 |
usr/idbm.c | 2 +-
|
|
|
360320 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
360320 |
|
|
|
360320 |
diff --git a/libiscsi/libiscsi.c b/libiscsi/libiscsi.c
|
|
|
360320 |
index c598aee..bddf9fc 100644
|
|
|
360320 |
--- a/libiscsi/libiscsi.c
|
|
|
360320 |
+++ b/libiscsi/libiscsi.c
|
|
|
360320 |
@@ -258,7 +258,7 @@ int libiscsi_discover_firmware(struct libiscsi_context *context,
|
|
|
360320 |
struct libiscsi_node *new_node = new_nodes;
|
|
|
360320 |
/* in one loop, add nodes to idbm and create libiscsi_node entries */
|
|
|
360320 |
list_for_each_entry(rec, &rec_list, list) {
|
|
|
360320 |
- CHECK(idbm_add_node(rec, NULL, 1 /* overwrite */));
|
|
|
360320 |
+ CHECK(idbm_add_node(rec, &drec, 1 /* overwrite */));
|
|
|
360320 |
|
|
|
360320 |
strlcpy(new_node->name, rec->name, LIBISCSI_VALUE_MAXLEN);
|
|
|
360320 |
new_node->tpgt = rec->tpgt;
|
|
|
360320 |
diff --git a/usr/idbm.c b/usr/idbm.c
|
|
|
360320 |
index e9025bf..9cc9c40 100644
|
|
|
360320 |
--- a/usr/idbm.c
|
|
|
360320 |
+++ b/usr/idbm.c
|
|
|
360320 |
@@ -2536,7 +2536,7 @@ int idbm_add_node(node_rec_t *newrec, discovery_rec_t *drec, int overwrite)
|
|
|
360320 |
if (rc)
|
|
|
360320 |
goto unlock;
|
|
|
360320 |
|
|
|
360320 |
- if (drec->type == DISCOVERY_TYPE_FW) {
|
|
|
360320 |
+ if (drec && drec->type == DISCOVERY_TYPE_FW) {
|
|
|
360320 |
log_debug(8, "setting firmware node 'startup' to 'onboot'");
|
|
|
360320 |
newrec->startup = ISCSI_STARTUP_ONBOOT;
|
|
|
360320 |
newrec->conn[0].startup = ISCSI_STARTUP_ONBOOT;
|
|
|
360320 |
--
|
|
|
360320 |
2.36.1
|
|
|
360320 |
|