From a652471c992b104911c4c102ffb91fe524869960 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Mon, 18 Dec 2017 13:23:21 +0900 Subject: [PATCH] autotest: uninitialized value in test/unit/lib/iscsi/tgt_node.c It looks that initiator groups which were initialized after being inserted to linked lists caused failures. Change-Id: I43f4a6324e77221f0e9657667c0185b15e9c229c Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.gerrithub.io/392100 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c | 57 +++++++++----------- 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c b/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c index 5ae376472..bf97f9bcf 100644 --- a/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c +++ b/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c @@ -340,9 +340,6 @@ node_access_multi_initiator_groups_cases(void) char *iqn, *addr; bool result; - memset(&ig1, 0, sizeof(ig1)); - memset(&ig2, 0, sizeof(ig2)); - /* target initialization */ memset(&tgtnode, 0, sizeof(struct spdk_iscsi_tgt_node)); tgtnode.name = IQN1; @@ -352,24 +349,6 @@ node_access_multi_initiator_groups_cases(void) strncpy(scsi_dev.name, IQN1, SPDK_SCSI_DEV_MAX_NAME); tgtnode.dev = &scsi_dev; - /* portal group initialization */ - memset(&pg, 0, sizeof(struct spdk_iscsi_portal_grp)); - pg.tag = 1; - - pg_map = spdk_iscsi_tgt_node_add_pg_map(&tgtnode, &pg); - spdk_iscsi_pg_map_add_ig_map(pg_map, &ig1); - spdk_iscsi_pg_map_add_ig_map(pg_map, &ig2); - - /* portal initialization */ - memset(&portal, 0, sizeof(struct spdk_iscsi_portal)); - portal.group = &pg; - portal.host = IP1; - portal.port = "3260"; - - /* connection initialization */ - memset(&conn, 0, sizeof(struct spdk_iscsi_conn)); - conn.portal = &portal; - /* initiator group initialization */ memset(&ig1, 0, sizeof(struct spdk_iscsi_init_grp)); ig1.tag = 1; @@ -397,6 +376,24 @@ node_access_multi_initiator_groups_cases(void) imask2.mask = NULL; TAILQ_INSERT_TAIL(&ig2.netmask_head, &imask2, tailq); + /* portal group initialization */ + memset(&pg, 0, sizeof(struct spdk_iscsi_portal_grp)); + pg.tag = 1; + + pg_map = spdk_iscsi_tgt_node_add_pg_map(&tgtnode, &pg); + spdk_iscsi_pg_map_add_ig_map(pg_map, &ig1); + spdk_iscsi_pg_map_add_ig_map(pg_map, &ig2); + + /* portal initialization */ + memset(&portal, 0, sizeof(struct spdk_iscsi_portal)); + portal.group = &pg; + portal.host = IP1; + portal.port = "3260"; + + /* connection initialization */ + memset(&conn, 0, sizeof(struct spdk_iscsi_conn)); + conn.portal = &portal; + iqn = IQN1; addr = IP1; @@ -594,8 +591,6 @@ allow_iscsi_name_multi_maps_case(void) char *iqn; bool result; - memset(&ig, 0, sizeof(ig)); - /* target initialization */ memset(&tgtnode, 0, sizeof(struct spdk_iscsi_tgt_node)); TAILQ_INIT(&tgtnode.pg_map_head); @@ -604,6 +599,14 @@ allow_iscsi_name_multi_maps_case(void) strncpy(scsi_dev.name, IQN1, SPDK_SCSI_DEV_MAX_NAME); tgtnode.dev = &scsi_dev; + /* initiator group initialization */ + memset(&ig, 0, sizeof(struct spdk_iscsi_init_grp)); + TAILQ_INIT(&ig.initiator_head); + + ig.ninitiators = 1; + iname.name = NULL; + TAILQ_INSERT_TAIL(&ig.initiator_head, &iname, tailq); + /* portal group initialization */ memset(&pg1, 0, sizeof(struct spdk_iscsi_portal_grp)); pg1.tag = 1; @@ -615,14 +618,6 @@ allow_iscsi_name_multi_maps_case(void) spdk_iscsi_pg_map_add_ig_map(pg_map1, &ig); spdk_iscsi_pg_map_add_ig_map(pg_map2, &ig); - /* initiator group initialization */ - memset(&ig, 0, sizeof(struct spdk_iscsi_init_grp)); - TAILQ_INIT(&ig.initiator_head); - - ig.ninitiators = 1; - iname.name = NULL; - TAILQ_INSERT_TAIL(&ig.initiator_head, &iname, tailq); - /* test for IG1 <-> PG1, PG2 case */ iqn = IQN1;