summaryrefslogtreecommitdiffstats
path: root/sys/cam
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2014-10-20 07:28:18 +0000
committermav <mav@FreeBSD.org>2014-10-20 07:28:18 +0000
commit072d9b12cad6e0a19c457a7b6b5bbe31540b642a (patch)
tree6a606813308aaa7c76b52ca78f7f7bf93b694eb2 /sys/cam
parent7aaab4b0ed52a57f5bcb9af530b18ba47b9032f4 (diff)
downloadFreeBSD-src-072d9b12cad6e0a19c457a7b6b5bbe31540b642a.zip
FreeBSD-src-072d9b12cad6e0a19c457a7b6b5bbe31540b642a.tar.gz
MFC r271395 (by trasz):
Make sure we handle less than zero timeouts in iSCSI initiator and target in a reasonable way. Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/cam')
-rw-r--r--sys/cam/ctl/ctl_frontend_iscsi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c
index e691bec..5f9b62a 100644
--- a/sys/cam/ctl/ctl_frontend_iscsi.c
+++ b/sys/cam/ctl/ctl_frontend_iscsi.c
@@ -997,7 +997,7 @@ cfiscsi_callout(void *context)
#ifdef ICL_KERNEL_PROXY
if (cs->cs_waiting_for_ctld || cs->cs_login_phase) {
- if (cs->cs_timeout > login_timeout) {
+ if (login_timeout > 0 && cs->cs_timeout > login_timeout) {
CFISCSI_SESSION_WARN(cs, "login timed out after "
"%d seconds; dropping connection", cs->cs_timeout);
cfiscsi_session_terminate(cs);
OpenPOWER on IntegriCloud