patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

net: dns-sd: Do not use sockaddr struct directly

Browse source 
The "struct sockaddr" should only be used in casts and never
as a standalone variable because it might not have enough
space allocated for all the protocol specific fields.
So refactor the port_in_use() function to reflect that.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
This commit is contained in:
Jukka Rissanen 2024-04-08 11:40:05 +03:00 committed by Anas Nashif
parent f77c7a3d05
commit cb7aae6f82
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
subsys/net/lib/dns/dns_sd.c
View file

@ -667,33 +667,40 @@ static bool port_in_use_sockaddr(uint16_t proto, uint16_t port,
|| net_context_port_in_use(proto, port, anyp);
}
static bool port_in_use(uint16_t proto, uint16_t port, const struct in_addr *addr4,
const struct in6_addr *addr6)
static bool port_in_use(uint16_t proto, uint16_t port,
const struct in_addr *addr4,
const struct in6_addr *addr6)
{
bool r;
struct sockaddr sa;
bool ret = false;
if (addr4 != NULL) {
net_sin(&sa)->sin_family = AF_INET;
net_sin(&sa)->sin_addr = *addr4;
struct sockaddr_in sa = { 0 };
r = port_in_use_sockaddr(proto, port, &sa);
if (r) {
return true;
sa.sin_family = AF_INET;
sa.sin_addr = *addr4;
ret = port_in_use_sockaddr(proto, port,
(struct sockaddr *)&sa);
if (ret) {
goto out;
}
}
if (addr6 != NULL) {
net_sin6(&sa)->sin6_family = AF_INET6;
net_sin6(&sa)->sin6_addr = *addr6;
struct sockaddr_in6 sa = { 0 };
r = port_in_use_sockaddr(proto, port, &sa);
if (r) {
return true;
sa.sin6_family = AF_INET6;
sa.sin6_addr = *addr6;
ret = port_in_use_sockaddr(proto, port,
(struct sockaddr *)&sa);
if (ret) {
goto out;
}
}
return false;
out:
return ret;
}
#else /* CONFIG_NET_TEST */
static inline bool port_in_use(uint16_t proto, uint16_t port, const struct in_addr *addr4,