SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nss-myhostname: add more INC_SAFE for buffer index accumulation

Browse Source 
Use overflow-safe INC_SAFE() instead of raw addition for idx
accumulation, so that Coverity can see the addition is checked.

CID#1548028

Follow-up for a05483a921
This commit is contained in:
Luca Boccassi
2026-04-12 13:24:50 +01:00
parent ff102359b7
commit 1afc0c6c60
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nss-myhostname/nss-myhostname.c
+7 -7
View File
@@ -230,7 +230,7 @@ static enum nss_status fill_in_hostent(
if (additional) {
r_alias = buffer + idx;
memcpy(r_alias, additional, l_additional+1);
idx += ALIGN(l_additional+1);
assert_se(INC_SAFE(&idx, ALIGN(l_additional+1)));
}
/* Second, create aliases array */
@@ -258,14 +258,14 @@ static enum nss_status fill_in_hostent(
}
assert(i == c);
idx += c*ALIGN(alen);
assert_se(INC_SAFE(&idx, c*ALIGN(alen)));
} else if (af == AF_INET) {
*(uint32_t*) r_addr = local_address_ipv4;
idx += ALIGN(alen);
assert_se(INC_SAFE(&idx, ALIGN(alen)));
} else if (socket_ipv6_is_enabled()) {
memcpy(r_addr, LOCALADDRESS_IPV6, FAMILY_ADDRESS_SIZE(AF_INET6));
idx += ALIGN(alen);
assert_se(INC_SAFE(&idx, ALIGN(alen)));
}
/* Fourth, add address pointer array */
@@ -277,15 +277,15 @@ static enum nss_status fill_in_hostent(
((char**) r_addr_list)[i] = r_addr + i*ALIGN(alen);
((char**) r_addr_list)[i] = NULL;
idx += (c+1) * sizeof(char*);
assert_se(INC_SAFE(&idx, (c+1) * sizeof(char*)));
} else if (af == AF_INET || socket_ipv6_is_enabled()) {
((char**) r_addr_list)[0] = r_addr;
((char**) r_addr_list)[1] = NULL;
idx += 2 * sizeof(char*);
assert_se(INC_SAFE(&idx, 2 * sizeof(char*)));
} else {
((char**) r_addr_list)[0] = NULL;
idx += sizeof(char*);
assert_se(INC_SAFE(&idx, sizeof(char*)));
}
/* Verify the size matches */