10:10 a.m.
Discovered during build scans using rpminspect of this software in
Fedora, CentOS, and RHEL. One thing rpminspect checks for is for any
software using functions from a runtime-configurable list of
"forbidden functions". A long standing goal is to ensure software
built and shipped in these distributions does not make use of
IPv4-only functions unless it is absolutely required.
Here are two patches to address the use of the IPv4-only functions in
this project.
(I am not a member of this mailing list, so for follow-ups make sure
my email address is included.)
Thanks,
--
David Cantrell <dcantrell(a)redhat.com>
Red Hat, Inc. | Boston, MA | EST5EDT
10:10 a.m.
New subject: [PATCH 1/2] net.c: Replace inet_ntoa() usage with inet_ntop()
Replace use of inet_ntoa() with inet_ntop() as the former only
supports IPv4 addresses.
Signed-off-by: David Cantrell <dcantrell(a)redhat.com>
---
net.c | 18 +++++++++++-------
remote.c | 3 ++-
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/net.c b/net.c
index 7c9c8bd..8cf5b48 100644
--- a/net.c
+++ b/net.c
@@ -339,6 +339,7 @@ cmd_net(void)
struct task_context *tc = NULL;
struct in_addr in_addr;
struct reference reference, *ref;
+ char addrbuf[INET_ADDRSTRLEN];
if (!(net->flags & NETDEV_INIT))
error(FATAL, "net subsystem not initialized!");
@@ -367,7 +368,7 @@ cmd_net(void)
case 'N':
value = stol(optarg, FAULT_ON_ERROR, NULL);
in_addr.s_addr = (in_addr_t)value;
- fprintf(fp, "%s\n", inet_ntoa(in_addr));
+ fprintf(fp, "%s\n", inet_ntop(AF_INET, &in_addr, addrbuf,
INET_ADDRSTRLEN));
return;
case 's':
@@ -730,6 +731,7 @@ print_neighbour_q(ulong addr, int key_len)
struct devinfo dinfo;
unsigned char state; /* state of ARP entry */
struct in_addr in_addr;
+ char addrbuf[INET_ADDRSTRLEN];
ha_size = (i = ARRAY_LENGTH(neighbour_ha)) ?
i : get_array_length("neighbour.ha", NULL, sizeof(char));
@@ -752,7 +754,7 @@ print_neighbour_q(ulong addr, int key_len)
FAULT_ON_ERROR);
in_addr.s_addr = ipaddr;
- fprintf(fp, "%-16lx %-16s", addr, inet_ntoa(in_addr));
+ fprintf(fp, "%-16lx %-16s", addr, inet_ntop(AF_INET, &in_addr, addrbuf,
INET_ADDRSTRLEN));
switch (dinfo.dev_type) {
case ARPHRD_ETHER:
@@ -884,6 +886,7 @@ get_device_address(ulong devaddr, char **bufp, long buflen)
{
ulong ip_ptr, ifa_list;
struct in_addr ifa_address;
+ char addrbuf[INET_ADDRSTRLEN];
char *buf;
char buf2[BUFSIZE];
long pos = 0;
@@ -906,7 +909,7 @@ get_device_address(ulong devaddr, char **bufp, long buflen)
&ifa_address, sizeof(struct in_addr), "ifa_address",
FAULT_ON_ERROR);
- sprintf(buf2, "%s%s", pos ? ", " : "",
inet_ntoa(ifa_address));
+ sprintf(buf2, "%s%s", pos ? ", " : "", inet_ntop(AF_INET,
&ifa_address, addrbuf, INET_ADDRSTRLEN));
if (pos + strlen(buf2) >= buflen) {
RESIZEBUF(*bufp, buflen, buflen * 2);
buf = *bufp;
@@ -938,6 +941,7 @@ get_sock_info(ulong sock, char *buf)
uint16_t u6_addr16_dest[8];
char buf2[BUFSIZE];
struct in_addr in_addr;
+ char addrbuf[INET_ADDRSTRLEN];
int len;
BZERO(buf, BUFSIZE);
@@ -1067,25 +1071,25 @@ get_sock_info(ulong sock, char *buf)
in_addr.s_addr = rcv_saddr;
sprintf(&buf[strlen(buf)], "%*s-%-*d%s",
BYTES_IP_ADDR,
- inet_ntoa(in_addr),
+ inet_ntop(AF_INET, &in_addr, addrbuf, INET_ADDRSTRLEN),
BYTES_PORT_NUM,
ntohs(sport),
space(1));
in_addr.s_addr = daddr;
sprintf(&buf[strlen(buf)], "%*s-%-*d%s",
BYTES_IP_ADDR,
- inet_ntoa(in_addr),
+ inet_ntop(AF_INET, &in_addr, addrbuf, INET_ADDRSTRLEN),
BYTES_PORT_NUM,
ntohs(dport),
space(1));
} else {
in_addr.s_addr = rcv_saddr;
sprintf(&buf[strlen(buf)], " %s-%d ",
- inet_ntoa(in_addr),
+ inet_ntop(AF_INET, &in_addr, addrbuf, INET_ADDRSTRLEN),
ntohs(sport));
in_addr.s_addr = daddr;
sprintf(&buf[strlen(buf)], "%s-%d",
- inet_ntoa(in_addr),
+ inet_ntop(AF_INET, &in_addr, addrbuf, INET_ADDRSTRLEN),
ntohs(dport));
}
}
diff --git a/remote.c b/remote.c
index 50a5e14..67d6f17 100644
--- a/remote.c
+++ b/remote.c
@@ -1856,6 +1856,7 @@ is_remote_daemon(char *dp)
char *portp, *filep, *file1, *file2;
struct hostent *hp;
struct sockaddr_in serv_addr;
+ char addrbuf[INET_ADDRSTRLEN];
if (!strstr(dp, ":") || file_exists(dp, NULL))
return FALSE;
@@ -1914,7 +1915,7 @@ is_remote_daemon(char *dp)
listptr = hp->h_addr_list;
while ((ip = (struct in_addr *) *listptr++) != NULL)
- printf("%s\n", inet_ntoa(*ip));
+ printf("%s\n", inet_ntop(AF_INET, ip, addrbuf,
INET_ADDRSTRLEN));
}
if ((pc->sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
--
2.35.1
10:10 a.m.
New subject: [PATCH 2/2] remote.c: Replace gethostbyname() with getaddrinfo()
Handle AF_INET6 in addition to AF_INET addresses. Use getaddrinfo()
in place of gethostbyname() along with the other IPv6-capable
networking functions. gethostbyname() is present in POSIX.1-2001 but
was removed in POSIX.1-2008 recommending getaddrinfo() instead.
Signed-off-by: David Cantrell <dcantrell(a)redhat.com>
---
remote.c | 67 +++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 45 insertions(+), 22 deletions(-)
diff --git a/remote.c b/remote.c
index 67d6f17..c9f73c2 100644
--- a/remote.c
+++ b/remote.c
@@ -71,9 +71,10 @@ struct remote_context *rc = &remote_context;
int
main(int argc, char **argv)
{
- int c, sockfd, newsockfd, clilen;
+ int c, hp, sockfd, newsockfd, clilen;
struct sockaddr_in serv_addr, cli_addr;
- struct hostent *hp;
+ struct addrinfo hints;
+ struct addrinfo *result;
ushort tcp_port;
char hostname[MAXHOSTNAMELEN];
@@ -112,9 +113,18 @@ main(int argc, char **argv)
console("hostname: %s\n", hostname);
- if ((hp = gethostbyname(hostname)) == NULL) {
- console("gethostbyname failed: %s\n", hstrerror(h_errno));
- perror("gethostbyname");
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_DGRAM;
+ hints.ai_flags = AI_PASSIVE;
+ hints.ai_protocol = 0;
+ hints.ai_canonname = NULL;
+ hints.ai_addr = NULL;
+ hints.ai_next = NULL;
+
+ if ((hp = getaddrinfo(hostname, NULL, &hints, &result)) != 0) {
+ console("getaddinfo failed: %s\n", gai_strerror(hp));
+ perror("getaddrinfo");
exit(1);
}
@@ -125,14 +135,15 @@ main(int argc, char **argv)
console("<daemon %d initiated>\n", getpid());
- if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
- exit(1);
-
BZERO((char *)&serv_addr, sizeof(serv_addr));
serv_addr.sin_family = AF_INET;
- BCOPY(hp->h_addr, (char *)&serv_addr.sin_addr, hp->h_length);
serv_addr.sin_port = htons(tcp_port);
+ BCOPY(result->ai_addr, (char *)&serv_addr.sin_addr,
result->ai_addrlen);
+
+ if ((sockfd = socket(result->ai_family, SOCK_STREAM, 0)) < 0)
+ exit(1);
+ freeaddrinfo(result);
daemon_socket_options(sockfd);
if (bind(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0){
@@ -1854,7 +1865,9 @@ is_remote_daemon(char *dp)
char sendbuf[BUFSIZE];
char recvbuf[BUFSIZE];
char *portp, *filep, *file1, *file2;
- struct hostent *hp;
+ int hp;
+ struct addrinfo hints;
+ struct addrinfo *result, *rp;
struct sockaddr_in serv_addr;
char addrbuf[INET_ADDRSTRLEN];
@@ -1904,18 +1917,27 @@ is_remote_daemon(char *dp)
fprintf(fp, " file2: [%s]\n", file2);
}
- if ((hp = gethostbyname(pc->server)) == NULL) {
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_DGRAM;
+ hints.ai_flags = AI_PASSIVE;
+ hints.ai_protocol = 0;
+ hints.ai_canonname = NULL;
+ hints.ai_addr = NULL;
+ hints.ai_next = NULL;
+
+ if ((hp = getaddrinfo(pc->server, NULL, &hints, &result)) != 0) {
herror(pc->server);
- error(FATAL, "gethostbyname [%s] failed\n", pc->server);
+ error(FATAL, "getaddrinfo [%s] failed: %s\n", pc->server,
gai_strerror(hp));
}
if (CRASHDEBUG(1)) {
- struct in_addr *ip;
- char **listptr;
+ struct in_addr *ip;
+ struct addrinfo *listptr;
- listptr = hp->h_addr_list;
- while ((ip = (struct in_addr *) *listptr++) != NULL)
- printf("%s\n", inet_ntop(AF_INET, ip, addrbuf,
INET_ADDRSTRLEN));
+ listptr = result;
+ for (listptr = result; listptr != NULL; listptr = listptr->ai_next)
+ printf("%s\n", inet_ntop(listptr->ai_family,
listptr->ai_addr, addrbuf, INET_ADDRSTRLEN));
}
if ((pc->sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
@@ -1924,20 +1946,21 @@ is_remote_daemon(char *dp)
}
BZERO((char *)&serv_addr, sizeof(struct sockaddr_in));
- serv_addr.sin_family = AF_INET;
- BCOPY(hp->h_addr, (char *)&serv_addr.sin_addr, hp->h_length);
+ serv_addr.sin_family = result->ai_family;
+ BCOPY(result->ai_addr, &serv_addr.sin_addr, result->ai_addrlen);
serv_addr.sin_port = htons(pc->port);
if (connect(pc->sockfd, (struct sockaddr *)&serv_addr,
sizeof(struct sockaddr_in)) < 0) {
- herror(hp->h_name);
- error(FATAL, "connect [%s:%d] failed\n", hp->h_name,
pc->port);
+ herror(pc->server);
+ error(FATAL, "connect [%s:%d] failed\n", pc->server,
pc->port);
clean_exit(1);
}
if (CRASHDEBUG(1))
- printf("connect [%s:%d]: success\n", hp->h_name, pc->port);
+ printf("connect [%s:%d]: success\n", pc->server,
pc->port);
+ freeaddrinfo(result);
remote_socket_options(pc->sockfd);
/*
--
2.35.1
978
days inactive
978
days old
devel@lists.crash-utility.osci.io
2 comments
1 participants
participants (1)
-
David Cantrell