File 0117-epmd-error-logging-fixes.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0117-epmd-error-logging-fixes.patch of Package erlang (Revision 3e585b5159e575cdaf8b197320891957)

Currently displaying revision 3e585b5159e575cdaf8b197320891957 , Show latest

From 9d9f5ee79740471e634937aa93b3e98e68339930 Mon Sep 17 00:00:00 2001
From: John Eckersberg <jeckersb@redhat.com>
Date: Mon, 11 Oct 2021 15:32:35 -0400
Subject: [PATCH] epmd: error logging fixes

- In epmd_ntop, the #if defined(EPMD6) conditional was inverted and it
  was only including the IPv6-specific code when EPMD6 was undefined.
  This was causing IPv6 addrs to be interpreted as IPv4 addrs and
  generating nonsense IPv4 addresses as output.

- Several places were incorrectly using 'num_sockets' instead of 'i'
  to index into the iserv_addr array during error logging.  This would
  result in a read into uninitialized data in the iserv_addr array.
---
 erts/epmd/src/epmd_srv.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
index 0cb6f48b7f..e10a6c4b95 100644
--- a/erts/epmd/src/epmd_srv.c
+++ b/erts/epmd/src/epmd_srv.c
@@ -212,7 +212,7 @@ static const char *epmd_ntop(struct sockaddr_storage *sa, char *buff, size_t len
     /* Save errno so that it is not changed by inet_ntop */
     int myerrno = errno;
     const char *res;
-#if !defined(EPMD6)
+#if defined(EPMD6)
     if (sa->ss_family == AF_INET6) {
         struct sockaddr_in6 *addr = (struct sockaddr_in6 *)sa;
         res = inet_ntop(
@@ -458,7 +458,7 @@ void run(EpmdVars *g)
       if (fcntl(listensock[i], F_SETFL, opt | O_NONBLOCK) == -1)
 #endif /* __WIN32__ */
 	dbg_perror(g,"failed to set non-blocking mode of listening socket %d on ipaddr %s",
-		   listensock[i], epmd_ntop(&iserv_addr[num_sockets],
+		   listensock[i], epmd_ntop(&iserv_addr[i],
                                             socknamebuf, sizeof(socknamebuf)));
 
       if (bind(listensock[i], sa, salen) < 0)
@@ -466,14 +466,14 @@ void run(EpmdVars *g)
 	  if (errno == EADDRINUSE)
 	    {
 	      dbg_tty_printf(g,1,"there is already a epmd running at port %d on ipaddr %s",
-			     g->port, epmd_ntop(&iserv_addr[num_sockets],
+			     g->port, epmd_ntop(&iserv_addr[i],
                                                 socknamebuf, sizeof(socknamebuf)));
 	      epmd_cleanup_exit(g,0);
 	    }
 	  else
 	    {
               dbg_perror(g,"failed to bind on ipaddr %s",
-                         epmd_ntop(&iserv_addr[num_sockets],
+                         epmd_ntop(&iserv_addr[i],
                                    socknamebuf, sizeof(socknamebuf)));
               epmd_cleanup_exit(g,1);
 	    }
@@ -481,7 +481,7 @@ void run(EpmdVars *g)
 
       if(listen(listensock[i], SOMAXCONN) < 0) {
           dbg_perror(g,"failed to listen on ipaddr %s",
-                     epmd_ntop(&iserv_addr[num_sockets],
+                     epmd_ntop(&iserv_addr[i],
                                socknamebuf, sizeof(socknamebuf)));
           epmd_cleanup_exit(g,1);
       }
-- 
2.31.1

Places

File 0117-epmd-error-logging-fixes.patch of Package erlang (Revision 3e585b5159e575cdaf8b197320891957)

Places