svn commit: r332619 - stable/11/sys/dev/iscsi

[Edward Tomasz Napierala]

Author: trasz
Date: Mon Apr 16 17:21:26 2018
New Revision: 332619
URL: https://svnweb.freebsd.org/changeset/base/332619

Log:
  MFC r330740:
  
  Check for duplicates when modifying an iSCSI session.  Previously we did
  this check on open, but "iscsictl -M", or an iSCSI redirect received by
  iscsid(8) could end up with two sessions with the same target name and
  portal.

Modified:
  stable/11/sys/dev/iscsi/iscsi.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/iscsi/iscsi.c
==============================================================================
--- stable/11/sys/dev/iscsi/iscsi.c	Mon Apr 16 17:18:06 2018	(r332618)
+++ stable/11/sys/dev/iscsi/iscsi.c	Mon Apr 16 17:21:26 2018	(r332619)
@@ -1960,6 +1960,7 @@ iscsi_ioctl_session_modify(struct iscsi_softc *sc,
     struct iscsi_session_modify *ism)
 {
 	struct iscsi_session *is;
+	const struct iscsi_session *is2;
 
 	iscsi_sanitize_session_conf(&ism->ism_conf);
 	if (iscsi_valid_session_conf(&ism->ism_conf) == false)
@@ -1968,14 +1969,42 @@ iscsi_ioctl_session_modify(struct iscsi_softc *sc,
 	sx_xlock(&sc->sc_lock);
 	TAILQ_FOREACH(is, &sc->sc_sessions, is_next) {
 		ISCSI_SESSION_LOCK(is);
-		if (is->is_id == ism->ism_session_id)
+		if (is->is_id == ism->ism_session_id) {
+			/* Note that the session remains locked. */
 			break;
+		}
 		ISCSI_SESSION_UNLOCK(is);
 	}
 	if (is == NULL) {
 		sx_xunlock(&sc->sc_lock);
 		return (ESRCH);
 	}
+
+	/*
+	 * Prevent duplicates.
+	 */
+	TAILQ_FOREACH(is2, &sc->sc_sessions, is_next) {
+		if (is == is2)
+			continue;
+
+		if (!!ism->ism_conf.isc_discovery !=
+		    !!is2->is_conf.isc_discovery)
+			continue;
+
+		if (strcmp(ism->ism_conf.isc_target_addr,
+		    is2->is_conf.isc_target_addr) != 0)
+			continue;
+
+		if (ism->ism_conf.isc_discovery == 0 &&
+		    strcmp(ism->ism_conf.isc_target,
+		    is2->is_conf.isc_target) != 0)
+			continue;
+
+		ISCSI_SESSION_UNLOCK(is);
+		sx_xunlock(&sc->sc_lock);
+		return (EBUSY);
+	}
+
 	sx_xunlock(&sc->sc_lock);
 
 	memcpy(&is->is_conf, &ism->ism_conf, sizeof(is->is_conf));