Merge ~sergiodj/ubuntu/+source/open-iscsi:fix-gcc12-ftbfs into ubuntu/+source/open-iscsi:ubuntu/devel

[Sergio Durigan Junior]

This fixes open-iscsi's FTBFS with GCC 12, as reported by Graham here:

https://people.canonical.com/~ginggs/ftbfs-report/test-rebuild-20220617-kinetic-gcc12-kinetic.html#ubuntu-server-pkgset

Upstream has fixes for this (https://github.com/open-iscsi/open-iscsi/pull/297), which have been released as part of v2.1.6, so this is just a backport.

I set up a special PPA that depends on Foundation's "volatile" and "binutils" PPAs (which contain GCC 12 and binutils 2.38) here:

https://launchpad.net/~sergiodj/+archive/ubuntu/gcc12-ftbfs

I will post the autopkgtest results as soon as I have them.

[Sergio Durigan Junior (sergiodj)]

Results from https://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-sergiodj-gcc12-ftbfs/?format=plain:
  open-iscsi @ amd64:
    23.06.22 22:51:28 Log 🗒️ ✅ Triggers: ['open-iscsi/2.1.5-1ubuntu2~ppa2']
  open-iscsi @ arm64:
    23.06.22 22:47:09 Log 🗒️ ✅ Triggers: ['open-iscsi/2.1.5-1ubuntu2~ppa2']
  open-iscsi @ armhf:
    23.06.22 22:29:04 Log 🗒️ ✅ Triggers: ['open-iscsi/2.1.5-1ubuntu2~ppa2']
  open-iscsi @ ppc64el:
    23.06.22 22:38:10 Log 🗒️ ✅ Triggers: ['open-iscsi/2.1.5-1ubuntu2~ppa2']
  open-iscsi @ s390x:
    23.06.22 22:32:55 Log 🗒️ ✅ Triggers: ['open-iscsi/2.1.5-1ubuntu2~ppa2']

[Lucas Kanashiro (lucaskanashiro)]

LGTM, +1.

review: Approve

[Sergio Durigan Junior (sergiodj)]

On Friday, June 24 2022, Lucas Kanashiro wrote:

> Review: Approve
>
> LGTM, +1.

$ dput open-iscsi_2.1.5-1ubuntu2_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/open-iscsi/open-iscsi_2.1.5-1ubuntu2_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/open-iscsi/open-iscsi_2.1.5-1ubuntu2.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading open-iscsi_2.1.5-1ubuntu2.dsc: done.
  Uploading open-iscsi_2.1.5-1ubuntu2.debian.tar.xz: done.
  Uploading open-iscsi_2.1.5-1ubuntu2_source.buildinfo: done.
  Uploading open-iscsi_2.1.5-1ubuntu2_source.changes: done.
Successfully uploaded packages.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

diff --git a/debian/changelog b/debian/changelog
index b1bd9d9..adbc089 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+open-iscsi (2.1.5-1ubuntu2) kinetic; urgency=medium
+
+  * d/p/lp1979692-fix-gcc12-ftbfs-0*.patch: Fix FTBFS with GCC 12.
+    (LP: #1979692)
+
+ -- Sergio Durigan Junior <[e-mail]>  Thu, 23 Jun 2022 17:28:56 -0400
+
 open-iscsi (2.1.5-1ubuntu1) jammy; urgency=medium
 
   * Merge with Debian unstable (LP: #1946835). Remaining changes:
diff --git a/debian/patches/lp1979692-fix-gcc12-ftbfs-01.patch b/debian/patches/lp1979692-fix-gcc12-ftbfs-01.patch
new file mode 100644
index 0000000..c97e8af
--- /dev/null
+++ b/debian/patches/lp1979692-fix-gcc12-ftbfs-01.patch
@@ -0,0 +1,99 @@
+From: Lee Duncan <[e-mail]>
+Date: Tue, 25 Jan 2022 10:11:58 -0800
+Subject: Fix issues discovered by gcc12
+
+Gcc-12 caught a few errors in the code where we were checking
+for an array being empty incorrectly, so this commit fixes those.
+
+Origin: upstream, https://github.com/open-iscsi/open-iscsi/commit/151e701d08e16dce545d017e57c3d5ac957b7c1e
+Bug: https://github.com/open-iscsi/open-iscsi/issues/296
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/open-iscsi/+bug/1979692
+Applied-Upstream: 2.1.6
+---
+ usr/auth.c  |  3 +--
+ usr/login.c | 18 +++++++++---------
+ 2 files changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/usr/auth.c b/usr/auth.c
+index 2f7506f..46c328e 100644
+--- a/usr/auth.c
++++ b/usr/auth.c
+@@ -109,7 +109,7 @@ acl_chap_auth_request(struct iscsi_acl *client, char *username, unsigned int id,
+ 	unsigned char verify_data[client->chap_challenge_len];
+ 
+ 	/* the expected credentials are in the session */
+-	if (session->username_in == NULL) {
++	if (session->username_in[0] == '\0') {
+ 		log_error("failing authentication, no incoming username "
+ 			  "configured to authenticate target %s",
+ 			  session->target_name);
+@@ -122,7 +122,6 @@ acl_chap_auth_request(struct iscsi_acl *client, char *username, unsigned int id,
+ 	}
+ 
+ 	if ((session->password_in_length < 1) ||
+-	    (session->password_in == NULL) ||
+ 	    (session->password_in[0] == '\0')) {
+ 		log_error("failing authentication, no incoming password "
+ 		       "configured to authenticate target %s",
+diff --git a/usr/login.c b/usr/login.c
+index 8af8756..096deda 100644
+--- a/usr/login.c
++++ b/usr/login.c
+@@ -657,7 +657,7 @@ iscsi_process_login_response(iscsi_session_t *session, int cid,
+ 	struct iscsi_acl *auth_client;
+ 	iscsi_conn_t *conn = &session->conn[cid];
+ 
+-	auth_client = (session->auth_buffers && session->num_auth_buffers) ?
++	auth_client = (session->num_auth_buffers > 0) ?
+ 		(struct iscsi_acl *)session->auth_buffers[0].address : NULL;
+ 
+ 	end = text + ntoh24(login_rsp->dlength) + 1;
+@@ -1135,7 +1135,7 @@ iscsi_make_login_pdu(iscsi_session_t *session, int cid, struct iscsi_hdr *hdr,
+ 	struct iscsi_acl *auth_client;
+ 	iscsi_conn_t *conn = &session->conn[cid];
+ 
+-	auth_client = (session->auth_buffers && session->num_auth_buffers) ?
++	auth_client = (session->num_auth_buffers > 0) ?
+ 		(struct iscsi_acl *)session->auth_buffers[0].address : NULL;
+ 
+ 	/* initialize the PDU header */
+@@ -1170,7 +1170,7 @@ iscsi_make_login_pdu(iscsi_session_t *session, int cid, struct iscsi_hdr *hdr,
+ 				return 0;
+ 		}
+ 
+-		if ((session->target_name && session->target_name[0]) &&
++		if ((session->target_name[0] != '\0') &&
+ 		    (session->type == ISCSI_SESSION_TYPE_NORMAL)) {
+ 			if (!iscsi_add_text(hdr, data, max_data_length,
+ 			    "TargetName", session->target_name))
+@@ -1248,16 +1248,16 @@ check_for_authentication(iscsi_session_t *session,
+ 		return LOGIN_FAILED;
+ 	}
+ 
+-	if (session->username &&
++	if ((session->username[0] != '\0') &&
+ 	    (acl_set_user_name(auth_client, session->username) !=
+-	    AUTH_STATUS_NO_ERROR)) {
++	     AUTH_STATUS_NO_ERROR)) {
+ 		log_error("Couldn't set username");
+ 		goto end;
+ 	}
+ 
+-	if (session->password && (acl_set_passwd(auth_client,
+-	    session->password, session->password_length) !=
+-		 AUTH_STATUS_NO_ERROR)) {
++	if ((session->password[0] != '\0') &&
++       	    (acl_set_passwd(auth_client, session->password, session->password_length) !=
++	     AUTH_STATUS_NO_ERROR)) {
+ 		log_error("Couldn't set password");
+ 		goto end;
+ 	}
+@@ -1366,7 +1366,7 @@ iscsi_login_begin(iscsi_session_t *session, iscsi_login_context_t *c)
+ 	conn->current_stage = ISCSI_INITIAL_LOGIN_STAGE;
+ 	conn->partial_response = 0;
+ 
+-	if (session->auth_buffers && session->num_auth_buffers) {
++	if (session->num_auth_buffers > 0) {
+ 		c->ret = check_for_authentication(session, c->auth_client);
+ 		if (c->ret != LOGIN_OK)
+ 			return 1;
diff --git a/debian/patches/lp1979692-fix-gcc12-ftbfs-02.patch b/debian/patches/lp1979692-fix-gcc12-ftbfs-02.patch
new file mode 100644
index 0000000..159412f
--- /dev/null
+++ b/debian/patches/lp1979692-fix-gcc12-ftbfs-02.patch
@@ -0,0 +1,45 @@
+From: Lee Duncan <[e-mail]>
+Date: Wed, 26 Jan 2022 11:44:09 -0800
+Subject: Fix more issues discovered by gcc12
+
+Gcc-12 caught a few more errors in the code, where we are
+still checking an array address for NULL, which will never
+happen.
+
+Origin: upstream, https://github.com/open-iscsi/open-iscsi/commit/1cab1efc813f750f9fa68e35dc16e8e54a1ba1e8
+Bug: https://github.com/open-iscsi/open-iscsi/issues/296
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/open-iscsi/+bug/1979692
+Applied-Upstream: 2.1.6
+---
+ usr/discovery.c   | 2 +-
+ usr/iscsi_sysfs.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/usr/discovery.c b/usr/discovery.c
+index 7dec696..587af6d 100644
+--- a/usr/discovery.c
++++ b/usr/discovery.c
+@@ -623,7 +623,7 @@ add_target_record(char *name, char *end, discovery_rec_t *drec,
+ 
+ 	/* if no address is provided, use the default */
+ 	if (text >= end) {
+-		if (drec->address == NULL) {
++		if (drec->address[0] == '\0') {
+ 			log_error("no default address known for target %s",
+ 				  name);
+ 			return 0;
+diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c
+index abefde2..8bc1f57 100644
+--- a/usr/iscsi_sysfs.c
++++ b/usr/iscsi_sysfs.c
+@@ -1416,8 +1416,8 @@ int iscsi_sysfs_get_sessioninfo_by_id(struct session_info *info, char *session)
+ 	log_debug(7, "found targetname %s address %s pers address %s port %d "
+ 		 "pers port %d driver %s iface name %s ipaddress %s "
+ 		 "netdev %s hwaddress %s iname %s",
+-		  info->targetname, info->address ? info->address : "NA",
+-		  info->persistent_address ? info->persistent_address : "NA",
++		  info->targetname, info->address[0] ? info->address : "NA",
++		  info->persistent_address[0] ? info->persistent_address : "NA",
+ 		  info->port, info->persistent_port, info->iface.transport_name,
+ 		  info->iface.name, info->iface.ipaddress,
+ 		  info->iface.netdev, info->iface.hwaddress,
diff --git a/debian/patches/series b/debian/patches/series
index e3bb90a..33b358e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 lp1755858-default-iscsid_conf-to-iscsid_socket.patch
 fix-ftbfs-strcpy-destination-size.patch
+lp1979692-fix-gcc12-ftbfs-01.patch
+lp1979692-fix-gcc12-ftbfs-02.patch