iscsid: fixformatoverflowwarning.

This function can be called with NULL arguments, so check that before
passing to log_error.
This commit is contained in:
louhongxiang 2023-06-25 14:18:05 +08:00
parent d5290666f9
commit e12b72440b
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From 0334727da730a3d011a8e8b350d8df2ddcf408ce Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com>
Date: Mon, 17 Apr 2023 17:04:40 -0700
Subject: [PATCH] discoveryd: fix format overflow warning (#413)
This function can be called with NULL arguments, so check that before
passing to log_error.
Signed-off-by: Chris Leech <cleech@redhat.com>
---
usr/discoveryd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr/discoveryd.c b/usr/discoveryd.c
index 08eb2bb..dd639a5 100644
--- a/usr/discoveryd.c
+++ b/usr/discoveryd.c
@@ -372,7 +372,7 @@ static int isns_disc_new_portals(const char *targetname, const char *iname)
&rec_list);
if (rc) {
log_error("Could not perform iSNS DevAttrQuery for node %s.",
- targetname);
+ targetname ? targetname : "(null)");
goto free_ifaces;
}
update_sessions(&rec_list, targetname, iname);
--
2.33.0

View File

@ -4,7 +4,7 @@
Name: open-iscsi
Version: 2.1.5
Release: 12
Release: 13
Summary: ISCSI software initiator daemon and utility programs
License: GPLv2+ and BSD
URL: http://www.open-iscsi.com
@ -36,6 +36,7 @@ patch24: 0024-Fix-a-possible-passing-null-pointer-in-usr-iface.c-3.patch
patch25: 0025-iscsid-iscsiuio-fix-OOM-adjustment-377.patch
patch26: 0026-iscsid-clear-scanning-thread-s-PR_SET_IO_FLUSHER-fla.patch
patch27: 0027-iscsid-stop-connection-for-recovery-if-error-is-not-.patch
patch28: 0028-discoveryd-fix-format-overflow-warning-413.patch
BuildRequires: flex bison doxygen kmod-devel systemd-units gcc git isns-utils-devel systemd-devel
BuildRequires: autoconf automake libtool libmount-devel openssl-devel pkg-config
@ -162,6 +163,9 @@ fi
%{_mandir}/man8/*
%changelog
* Sun Jun 25 2023 louhongxiang <louhongxiang@huawei.com> - 2.1.5-13
- iscsid: fix format overflow warning.
* Tue Jan 17 2023 haowenchao <haowenchao@huawei.com> - 2.1.5-12
- iscsid: stop connection for recovery if error is not timeout in iscsi_login_eh