diff options
| author |   claudio <claudio@openbsd.org> | 2014-11-23 13:08:21 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2014-11-23 13:08:21 +0000 |
| commit | 64d8b5c87c0a26f36309a8e8590fa312e19d751c (patch) | |
| tree | bf85cb663f74edb576141ed977fedd5ae15ec075 /usr.sbin/iscsid | |
| parent | Clear the work in progress PDU before calling the task handler. (diff) | |
| download | wireguard-openbsd-64d8b5c87c0a26f36309a8e8590fa312e19d751c.tar.xz wireguard-openbsd-64d8b5c87c0a26f36309a8e8590fa312e19d751c.zip | |
Change the error handling a bit to ensure we do not double free the task
by calling conn_task_cleanup() twice (once direct and once via conn_fail()).
The error handling needs some more work but at least this fixes the crash
found by jasper@
Diffstat (limited to 'usr.sbin/iscsid')
| -rw-r--r-- | usr.sbin/iscsid/initiator.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.sbin/iscsid/initiator.c b/usr.sbin/iscsid/initiator.c index a9903b8b8f4..22ab3d856d5 100644 --- a/usr.sbin/iscsid/initiator.c +++ b/usr.sbin/iscsid/initiator.c @@ -1,4 +1,4 @@ -/* $OpenBSD: initiator.c,v 1.13 2014/05/10 11:30:47 claudio Exp $ */ +/* $OpenBSD: initiator.c,v 1.14 2014/11/23 13:08:21 claudio Exp $ */ /* * Copyright (c) 2009 Claudio Jeker <claudio@openbsd.org> @@ -433,6 +433,8 @@ initiator_login_cb(struct connection *c, void *arg, struct pdu *p) break; case ISCSI_LOGIN_STG_FULL: conn_fsm(c, CONN_EV_LOGGED_IN); + conn_task_cleanup(c, &tl->task); + free(tl); goto done; default: log_warnx("initiator_login_cb: exit stage left"); @@ -445,8 +447,6 @@ initiator_login_cb(struct connection *c, void *arg, struct pdu *p) conn_task_issue(c, &tl->task); return; done: - conn_task_cleanup(c, &tl->task); - free(tl); if (p) pdu_free(p); } @@ -488,6 +488,8 @@ initiator_discovery_cb(struct connection *c, void *arg, struct pdu *p) ISCSI_PDU_OPCODE(lresp->opcode)); fail: conn_fail(c); + pdu_free(p); + return; } conn_task_cleanup(c, t); free(t); @@ -528,7 +530,8 @@ initiator_logout_cb(struct connection *c, void *arg, struct pdu *p) default: /* need to retry logout after loresp->time2wait secs */ conn_fail(tl->c); - break; + pdu_free(p); + return; } conn_task_cleanup(c, &tl->task); |