Skip to contentSkip to conversation

iscsi-initiator-utils: Silence a clang warning on 64bit systems

PATCH New Khem Raj 1 participant 1 message Oct 21, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 iscsi-initiator-utils: Silence a clang warning on 64bit systems

This unbreaks the build with clang as well.

---
 ...Compare-with-max-int-instead-of-max-.patch | 48 +++++++++++++++++++
 .../iscsi-initiator-utils_2.1.2.bb            |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch
meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch new file +48 -0
new file mode 100644
index 0000000000..c71f01299b
@@ -0,0 +1,48 @@
+From 7bdaa32c80bb7d37668c1ff6d88bb02428459a0f Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 21 Oct 2020 09:11:20 -0700
+Subject: [PATCH] libopeniscsiusr: Compare with max int instead of max long
+
+This compares value member of int_list_tbl struct which is of unsigned
+int type.
+
+struct int_list_tbl {
+const char *name;
+unsigned int value;
+};
+
+Clang compiler reports this comparison when
+-Wtautological-constant-out-of-range-compare is enabled
+
+| idbm.c:1042:2: error: result of comparison of constant 18446744073709551615 with expression of type 'unsigned int' is always true [-Werror,-Wtautological-constant-out-of-range-compare]
+|         _rec_int_list(SESSION_CHAP_ALGS, recs, node, session.auth.chap_algs,
+|         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+| idbm.c:263:23: note: expanded from macro '_rec_int_list'
+|                 if (_org->_name[_i] != ~0UL) { \
+|                     ~~~~~~~~~~~~~~~ ^  ~~~~
+
+Since max value for int can be less than unsinged long e.g. on LP64 its
+better to use UINT_MAX here
+
+Upstream-Status: Submitted [https://github.com/open-iscsi/open-iscsi/pull/227]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ libopeniscsiusr/idbm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c
+index 7bc2381..060196f 100644
+--- a/libopeniscsiusr/idbm.c
++++ b/libopeniscsiusr/idbm.c
+@@ -260,7 +260,7 @@ do {\
+ 	_recs[_n].type = TYPE_INT_LIST; \
+ 	_strncpy(_recs[_n].name, _key, NAME_MAXVAL); \
+ 	for (unsigned int _i = 0; _i < ARRAY_LEN(_org->_name); _i++) { \
+-		if (_org->_name[_i] != ~0UL) { \
++		if (_org->_name[_i] != UINT_MAX) { \
+ 			for (unsigned int _j = 0; _j < ARRAY_LEN(_tbl); _j++) { \
+ 				if (_tbl[_j].value == _org->_name[_i]) { \
+ 					strcat(_recs[_n].value, _tbl[_j].name); \
+-- 
+2.29.0
+
meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb +1 -0
index 254362881b..dfcd4ee3cb 100644
@@ -16,6 +16,7 @@ SRCREV ?= "802688debcd88c48edabe86deb7e7ed47ebadc26"
 
 SRC_URI = "git://github.com/open-iscsi/open-iscsi \
            file://0001-Makefile-Do-not-set-Werror.patch \
+           file://0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch \
            file://initd.debian \
            file://99_iscsi-initiator-utils \
            file://iscsi-initiator \
Signature · 1 line
2.29.0