From fa6b811e7d0dc00bc776b1cdd39af14d6abde950 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Fri, 9 Jan 2026 14:00:57 +0100 Subject: [PATCH 1/2] s390: Fix string comparison in bd_s390_zfcp_scsi_offline --- src/plugins/s390.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/s390.c b/src/plugins/s390.c index 064586e3..83535a25 100644 --- a/src/plugins/s390.c +++ b/src/plugins/s390.c @@ -883,7 +883,7 @@ gboolean bd_s390_zfcp_scsi_offline (const gchar *devno, const gchar *wwpn, const /* make sure read values align with expected values */ scsidel = g_strdup_printf ("%s/%s/delete", scsidevsysfs, scsidev); scsidel = g_strchomp (scsidel); - if ((fcphbasysfs == devno) && (fcpwwpnsysfs == wwpn) && (fcplunsysfs == lun)) { + if (g_strcmp0 (fcphbasysfs, devno) == 0 && g_strcmp0 (fcpwwpnsysfs, wwpn) == 0 && g_strcmp0 (fcplunsysfs, lun) == 0) { fd = fopen (scsidel, "w"); if (!fd) { g_set_error (&l_error, BD_S390_ERROR, BD_S390_ERROR_DEVICE, From 0e2157bc840e2217425dc293308ececf86341951 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Fri, 9 Jan 2026 14:16:08 +0100 Subject: [PATCH 2/2] s390: Remove trailing newlines from values read by getline --- src/plugins/s390.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/s390.c b/src/plugins/s390.c index 83535a25..20a59828 100644 --- a/src/plugins/s390.c +++ b/src/plugins/s390.c @@ -812,6 +812,7 @@ gboolean bd_s390_zfcp_scsi_offline (const gchar *devno, const gchar *wwpn, const g_propagate_error (error, l_error); return FALSE; } + g_strchomp (fcphbasysfs); fclose (fd); g_free (hba_path); @@ -843,6 +844,7 @@ gboolean bd_s390_zfcp_scsi_offline (const gchar *devno, const gchar *wwpn, const g_propagate_error (error, l_error); return FALSE; } + g_strchomp (fcpwwpnsysfs); fclose (fd); g_free (wwpn_path); @@ -876,6 +878,7 @@ gboolean bd_s390_zfcp_scsi_offline (const gchar *devno, const gchar *wwpn, const g_propagate_error (error, l_error); return FALSE; } + g_strchomp (fcplunsysfs); fclose (fd); g_free (lun_path); g_free (fcpsysfs);