Skip to content

s390: Fix string comparison in bd_s390_zfcp_scsi_offline #1160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vojtechtrefny wants to merge 2 commits into
base: master
Choose a base branch
from
Open

s390: Fix string comparison in bd_s390_zfcp_scsi_offline #1160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa6b811
s390: Fix string comparison in bd_s390_zfcp_scsi_offline
vojtechtrefny Jan 9, 2026
0e2157b
s390: Remove trailing newlines from values read by getline
vojtechtrefny Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/plugins/s390.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -876,14 +878,15 @@ 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);

/* 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,
Expand Down