laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27097 ) Change subject: tests: in46a_test: Make coverity happy when calling in46a_from_eua ...................................................................... tests: in46a_test: Make coverity happy when calling in46a_from_eua Coverity warns around that test code: "Overrunning struct type in46_addr of 20 bytes by passing it to a function which accesses it at byte offset 39." That's basically because in64a_from_eua expects to be passed a 2 element array to be filled. The second element, though, is only accessed in the case where an IPv4v6 EUA is passed, so in the cases where the test explicitly passes an IPv4 or IPv6 EUA it's not really an issue, hence coverity throwing a false positive here. Let's anyway rewrite the code to pass a 2 element array for completeness, since it doesn't hurt and makes coverity happy. Related: Coverity CID#249006 Change-Id: Idfc9104f48eeee6e7f11ebc5c17d4b0e4b2fe9e2 --- M tests/lib/in46a_test.c 1 file changed, 19 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/lib/in46a_test.c b/tests/lib/in46a_test.c index d6c4f47..d576124 100644 --- a/tests/lib/in46a_test.c +++ b/tests/lib/in46a_test.c @@ -146,7 +146,7 @@ static void test_in46a_from_eua(void) { - struct in46_addr ia; + struct in46_addr ia[2]; struct ul66_t eua; const uint8_t v4_unspec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v4 }; const uint8_t v4_spec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v4, 1,2,3,4 }; @@ -155,35 +155,35 @@ printf("Testing in46a_from_eua() with IPv4 addresses\n"); /* default: v4 unspec */ - OSMO_ASSERT(in46a_from_eua(&eua, &ia) == 1); - OSMO_ASSERT(ia.len == 4); - OSMO_ASSERT(ia.v4.s_addr == 0); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 4); + OSMO_ASSERT(ia[0].v4.s_addr == 0); /* invalid */ eua.v[0] = 0x23; eua.v[1] = PDP_EUA_TYPE_v4; eua.l = 6; - OSMO_ASSERT(in46a_from_eua(&eua, &ia) < 0); + OSMO_ASSERT(in46a_from_eua(&eua, ia) < 0); /* invalid */ eua.v[0] = PDP_EUA_ORG_IETF; eua.v[1] = 0x23; eua.l = 6; - OSMO_ASSERT(in46a_from_eua(&eua, &ia) < 0); + OSMO_ASSERT(in46a_from_eua(&eua, ia) < 0); /* unspecified V4 */ memcpy(eua.v, v4_unspec, sizeof(v4_unspec)); eua.l = sizeof(v4_unspec); - OSMO_ASSERT(in46a_from_eua(&eua, &ia) == 1); - OSMO_ASSERT(ia.len == 4); - OSMO_ASSERT(ia.v4.s_addr == 0); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 4); + OSMO_ASSERT(ia[0].v4.s_addr == 0); /* specified V4 */ memcpy(eua.v, v4_spec, sizeof(v4_spec)); eua.l = sizeof(v4_spec); - OSMO_ASSERT(in46a_from_eua(&eua, &ia) == 1); - OSMO_ASSERT(ia.len == 4); - OSMO_ASSERT(ia.v4.s_addr == htonl(0x01020304)); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 4); + OSMO_ASSERT(ia[0].v4.s_addr == htonl(0x01020304)); } static void test_in46a_netmasklen(void) @@ -318,7 +318,7 @@ static void test_in46a_from_eua_v6(void) { - struct in46_addr ia; + struct in46_addr ia[2]; struct ul66_t eua; const uint8_t v6_unspec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v6 }; const uint8_t v6_spec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v6, @@ -331,16 +331,16 @@ /* unspecified V6 */ memcpy(eua.v, v6_unspec, sizeof(v6_unspec)); eua.l = sizeof(v6_unspec); - OSMO_ASSERT(in46a_from_eua(&eua, &ia) == 1); - OSMO_ASSERT(ia.len == 16); - OSMO_ASSERT(IN6_IS_ADDR_UNSPECIFIED(&ia.v6)); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 16); + OSMO_ASSERT(IN6_IS_ADDR_UNSPECIFIED(&ia[0].v6)); /* specified V6 */ memcpy(eua.v, v6_spec, sizeof(v6_spec)); eua.l = sizeof(v6_spec); - OSMO_ASSERT(in46a_from_eua(&eua, &ia) == 1); - OSMO_ASSERT(ia.len == 16); - OSMO_ASSERT(!memcmp(&ia.v6, v6_spec+2, ia.len)); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 16); + OSMO_ASSERT(!memcmp(&ia[0].v6, v6_spec+2, ia[0].len)); } static void test_in46a_from_eua_v4v6(void) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Idfc9104f48eeee6e7f11ebc5c17d4b0e4b2fe9e2 Gerrit-Change-Number: 27097 Gerrit-PatchSet: 1 Gerrit-Owner: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-Reviewer: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-MessageType: merged