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

Improve robustness of the code that restores .queue_pdu()

Browse Source 
In my tests I hit a stack overflow caused by infinite recursion of
.queue_pdu() calls, caused by .queue_pdu() not being restored in an
error path. Make the approach for restoring .queue_pdu() more robust.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
This commit is contained in:
Bart Van Assche
2019-11-03 14:59:11 -08:00
parent 10599fcd4f
commit cc3ddbff42
10 changed files with 19 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test-tool/test_iscsi_chap.c
View File

@@ -29,8 +29,6 @@
#include "scsi-lowlevel.h"
#include "iscsi-test-cu.h"
static struct iscsi_transport iscsi_drv_orig;
static int
test_iscsi_strip_tag(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
const char *tag)
@@ -103,10 +101,8 @@ chap_mod_strip_replace_queue(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
return ret;
}
logging(LOG_VERBOSE, "replaced Login PDU CHAP_A setting with %s", new_chap_a);
/* restore drv */
*iscsi->drv = iscsi_drv_orig;
out:
return iscsi_drv_orig.queue_pdu(iscsi, pdu);
return orig_queue_pdu(iscsi, pdu);
}
@@ -157,7 +153,6 @@ test_iscsi_chap_login(int (*test_queue_pdu)(struct iscsi_context *iscsi,
iscsi_url->passwd);
/* override transport queue_pdu callback for PDU manipulation */
iscsi_drv_orig = *iscsi->drv;
iscsi->drv->queue_pdu = test_queue_pdu;
ret = iscsi_full_connect_sync(iscsi, iscsi_url->portal, iscsi_url->lun);
@@ -169,7 +164,6 @@ test_iscsi_chap_login(int (*test_queue_pdu)(struct iscsi_context *iscsi,
ret = 0;
err_url_destroy:
iscsi_destroy_url(iscsi_url);
/* XXX no need to restore iscsi_drv_orig */
err_iscsi_destroy:
iscsi_destroy_context(iscsi);
return ret;