diff options
| author | Erlang/OTP <[email protected]> | 2019-05-06 17:09:05 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-05-06 17:09:05 +0200 |
| commit | eea3a5a6852235429a2317c706dce946295f3943 (patch) | |
| tree | 80ee1e86c1979cfa20ef940fcdbaabb10263bd1e | |
| parent | 68a90eb777b5c1e48c0760337fbf2b0b8a9aa6aa (diff) | |
| parent | e05ce24868c8391103faea7de3f230fa8f2ce0a2 (diff) | |
| download | otp-eea3a5a6852235429a2317c706dce946295f3943.tar.gz otp-eea3a5a6852235429a2317c706dce946295f3943.tar.bz2 otp-eea3a5a6852235429a2317c706dce946295f3943.zip | |
Merge branch 'rickard/ei-nodename/OTP-15781' into maint-21
* rickard/ei-nodename/OTP-15781:
Increase max number of node name characters to 256
| -rw-r--r-- | lib/erl_interface/include/ei.h | 6 | ||||
| -rw-r--r-- | lib/erl_interface/src/connect/ei_connect.c | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/lib/erl_interface/include/ei.h b/lib/erl_interface/include/ei.h index ca4960b252..947726208e 100644 --- a/lib/erl_interface/include/ei.h +++ b/lib/erl_interface/include/ei.h @@ -191,12 +191,12 @@ extern volatile int __erl_errno; * library and when using the library we set a value that we use */ -#define EI_MAXHOSTNAMELEN 64 -#define EI_MAXALIVELEN 63 #define EI_MAX_COOKIE_SIZE 512 #define MAXATOMLEN (255 + 1) #define MAXATOMLEN_UTF8 (255*4 + 1) -#define MAXNODELEN EI_MAXALIVELEN+1+EI_MAXHOSTNAMELEN +#define EI_MAXHOSTNAMELEN (MAXATOMLEN - 2) +#define EI_MAXALIVELEN (MAXATOMLEN - 2) +#define MAXNODELEN MAXATOMLEN typedef enum { ERLANG_ASCII = 1, diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c index 7a304e6d4f..95cb10a20c 100644 --- a/lib/erl_interface/src/connect/ei_connect.c +++ b/lib/erl_interface/src/connect/ei_connect.c @@ -791,14 +791,17 @@ int ei_connect_init_ussi(ei_cnode* ec, const char* this_node_name, if (strcmp(hp->h_name, "localhost") == 0) { /* We use a short node name */ if ((ct = strchr(thishostname, '.')) != NULL) *ct = '\0'; - sprintf(thisnodename, "%s@%s", this_node_name, thishostname); } else { /* We use a short node name */ if ((ct = strchr(hp->h_name, '.')) != NULL) *ct = '\0'; strcpy(thishostname, hp->h_name); - sprintf(thisnodename, "%s@%s", this_node_name, hp->h_name); } } + if (strlen(this_node_name) + 1 + strlen(thishostname) > MAXNODELEN) { + EI_TRACE_ERR0("ei_connect_init_ussi","this node name is too long"); + return ERL_ERROR; + } + sprintf(thisnodename, "%s@%s", this_node_name, thishostname); res = ei_connect_xinit_ussi(ec, thishostname, thisalivename, thisnodename, (struct in_addr *)*hp->h_addr_list, cookie, creation, cbs, cbs_sz, setup_context); @@ -889,6 +892,11 @@ int ei_connect_tmo(ei_cnode* ec, char *nodename, unsigned ms) int ei_h_errno; #endif /* !win32 */ int res; + + if (strlen(nodename) > MAXNODELEN) { + EI_TRACE_ERR0("ei_connect","Too long nodename"); + return ERL_ERROR; + } /* extract the host and alive parts from nodename */ if (!(hostname = strchr(nodename,'@'))) { |