Date: Tue, 10 Dec 2013 18:18:39 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r259183 - head/sys/dev/iscsi Message-ID: <201312101818.rBAIId6U055278@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Tue Dec 10 18:18:39 2013 New Revision: 259183 URL: http://svnweb.freebsd.org/changeset/base/259183 Log: Properly refuse handoff requests on already connected sessions. Previously this would result in dropping the session. MFC after: 2 days Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/iscsi/iscsi.c Modified: head/sys/dev/iscsi/iscsi.c ============================================================================== --- head/sys/dev/iscsi/iscsi.c Tue Dec 10 17:27:11 2013 (r259182) +++ head/sys/dev/iscsi/iscsi.c Tue Dec 10 18:18:39 2013 (r259183) @@ -1247,6 +1247,18 @@ iscsi_ioctl_daemon_handoff(struct iscsi_ sx_sunlock(&sc->sc_lock); return (EINVAL); } + if (is->is_connected) { + /* + * This might have happened because another iscsid(8) + * instance handed off the connection in the meantime. + * Just return. + */ + ISCSI_SESSION_WARN(is, "handoff on already connected " + "session"); + ISCSI_SESSION_UNLOCK(is); + sx_sunlock(&sc->sc_lock); + return (EBUSY); + } strlcpy(is->is_target_alias, handoff->idh_target_alias, sizeof(is->is_target_alias));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312101818.rBAIId6U055278>