Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17c61ad6 authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

iscsi-target: Fix early login failure statistics misses 



Due to the long standing checks in iscsit_snmp_get_tiqn()
that assume conn->sess->tpg dereference of tpg->tpg_tiqn
for iscsit_collect_login_stats() usage, some of the early
login failure cases like ISCSI_LOGIN_STATUS_TGT_FORBIDDEN
where not getting incremented, due to sess->tpg assignment
happening later in iscsi_login_zero_tsih_s2().

Instead, use the earlier conn->tpg assignment done by
iscsi_target_locate_portal() -> iscsit_get_tpg_from_np()
so the existing counters are incremented correctly for
the various early login failure cases.

Also, go ahead and drop the old rate limiting check in
iscsit_collect_login_stats(), so we get the true number
of failed login attempts in the existing statistics.

Reported-by: default avatarRyan Stiles <ras@datera.io>
Cc: Ryan Stiles <ras@datera.io>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent bd4e2d29

drivers/target/iscsi/iscsi_target_util.c

+2 −36
Original line number Diff line number Diff line
@@ -1378,33 +1378,6 @@ int tx_data( 
	return iscsit_do_tx_data(conn, &c);

}



static bool sockaddr_equal(struct sockaddr_storage *x, struct sockaddr_storage *y)

{

	switch (x->ss_family) {

	case AF_INET: {

		struct sockaddr_in *sinx = (struct sockaddr_in *)x;

		struct sockaddr_in *siny = (struct sockaddr_in *)y;

		if (sinx->sin_addr.s_addr != siny->sin_addr.s_addr)

			return false;

		if (sinx->sin_port != siny->sin_port)

			return false;

		break;

	}

	case AF_INET6: {

		struct sockaddr_in6 *sinx = (struct sockaddr_in6 *)x;

		struct sockaddr_in6 *siny = (struct sockaddr_in6 *)y;

		if (!ipv6_addr_equal(&sinx->sin6_addr, &siny->sin6_addr))

			return false;

		if (sinx->sin6_port != siny->sin6_port)

			return false;

		break;

	}

	default:

		return false;

	}

	return true;

}



void iscsit_collect_login_stats(

	struct iscsi_conn *conn,

	u8 status_class,
@@ -1421,13 +1394,6 @@ void iscsit_collect_login_stats( 
	ls = &tiqn->login_stats;



	spin_lock(&ls->lock);

	if (sockaddr_equal(&conn->login_sockaddr, &ls->last_intr_fail_sockaddr) &&

	    ((get_jiffies_64() - ls->last_fail_time) < 10)) {

		/* We already have the failure info for this login */

		spin_unlock(&ls->lock);

		return;

	}



	if (status_class == ISCSI_STATUS_CLS_SUCCESS)

		ls->accepts++;

	else if (status_class == ISCSI_STATUS_CLS_REDIRECT) {
@@ -1472,10 +1438,10 @@ struct iscsi_tiqn *iscsit_snmp_get_tiqn(struct iscsi_conn *conn) 
{

	struct iscsi_portal_group *tpg;



	if (!conn || !conn->sess)

	if (!conn)

		return NULL;



	tpg = conn->sess->tpg;

	tpg = conn->tpg;

	if (!tpg)

		return NULL;