admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

test-tool: fix MPIO clear_pr() behaviour

Browse Source 
clear_pr() can be called before connect_scsi_device() has been invoked
on each MPIO sdev. This results in a NULL pointer dereference in the
send_scsi_command() MPIO NOP-responder code-path.

Fix this by invoking clear_pr() after the MPIO connect_scsi_device()
loop has run. clear_pr() also only needs to be invoked via a single
path, so do so via the first path only.

Link: https://github.com/sahlberg/libiscsi/issues/289
Fixes: 16435a9 ("iscsi-test-cu: Improve persistent reservation clearing")
Signed-off-by: David Disseldorp <ddiss@suse.de>
This commit is contained in:
David Disseldorp
2019-04-15 14:32:54 +02:00
parent cdd0448052
commit 1af3314e2b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test-tool/iscsi-test-cu.c
View File

@@ -1245,12 +1245,13 @@ main(int argc, char *argv[])
"Failed to connect to SCSI device %d\n", i);
goto err_sds_free;
}
if (clear_pr(mp_sds[i]) < 0) {
printf("One or more persistent reservations keys have been registered\n");
return -1;
}
}
if (clear_pr(sd) < 0) {
printf("One or more persistent reservations keys have been registered\n");
goto err_sds_free;
}
if (mp_num_sds > 1) {
/* check that all multipath sds identify as the same LU */
res = mpath_check_matching_ids(mp_num_sds, mp_sds);