kernel: Add early reject of invalid node names

1 files changed, 16 insertions, 3 deletions

diff --git a/lib/kernel/src/dist_util.erl b/lib/kernel/src/dist_util.erl
index 1c326afca8..b3507e5d13 100644
--- a/lib/kernel/src/dist_util.erl
+++ b/lib/kernel/src/dist_util.erl
@@ -572,12 +572,25 @@ recv_name(#hs_data{socket = Socket, f_recv = Recv}) ->
 	    ?shutdown(no_node)
     end.
 
-get_name([$n,VersionA, VersionB, Flag1, Flag2, Flag3, Flag4 | OtherNode]) ->
-    {?u32(Flag1, Flag2, Flag3, Flag4), list_to_atom(OtherNode), 
-     ?u16(VersionA,VersionB)};
+get_name([$n,VersionA, VersionB, Flag1, Flag2, Flag3, Flag4 | OtherNode] = Data) ->
+    case is_valid_name(OtherNode) of
+        true ->
+            {?u32(Flag1, Flag2, Flag3, Flag4), list_to_atom(OtherNode), 
+             ?u16(VersionA,VersionB)};
+        false ->
+            ?shutdown(Data)
+    end;
 get_name(Data) ->
     ?shutdown(Data).
 
+is_valid_name(OtherNodeName) ->
+    case string:lexemes(OtherNodeName,"@") of
+        [_OtherNodeName,_OtherNodeHost] ->
+            true;
+        _else ->
+            false
+    end.
+
 publish_type(Flags) ->
     case Flags band ?DFLAG_PUBLISHED of
 	0 ->