Merge branch 'john/crypto/fix-segfault-on-badarg/OTP-15194/ERL-673' into maint-21

* john/crypto/fix-segfault-on-badarg/OTP-15194/ERL-673:
  crypto: Fix crash in compute_key(ecdh, ...) on badarg

2 files changed, 17 insertions, 2 deletions

diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 6eeebb67a2..f8d1778bb9 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -3810,7 +3810,7 @@ static ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF
     int i;
     EC_GROUP *group;
     const BIGNUM *priv_key;
-    EC_POINT *my_ecpoint;
+    EC_POINT *my_ecpoint = NULL;
     EC_KEY *other_ecdh = NULL;
 
     if (!get_ec_key(env, argv[1], argv[2], atom_undefined, &key))
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index ebb55c4a34..943062f56f 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -31,6 +31,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() ->
     [app,
+     {group, api_errors},
      appup,
      {group, fips},
      {group, non_fips},
@@ -170,7 +171,8 @@ groups() ->
      {no_aes_ige256, [], [no_support, no_block]},
      {no_chacha20_poly1305, [], [no_support, no_aead]},
      {no_rc2_cbc, [], [no_support, no_block]},
-     {no_rc4, [], [no_support, no_stream]}
+     {no_rc4, [], [no_support, no_stream]},
+     {api_errors, [], [api_errors_ecdh]}
     ].
 
 %%-------------------------------------------------------------------
@@ -238,6 +240,8 @@ init_per_group(non_fips, Config) ->
         _NotEnabled ->
             NonFIPSConfig
     end;
+init_per_group(api_errors, Config) ->
+    Config;
 init_per_group(GroupName, Config) ->
     case atom_to_list(GroupName) of
         "no_" ++ TypeStr ->
@@ -2510,3 +2514,14 @@ parse_rsp_cmac(Type, Key0, Msg0, Mlen0, Tlen, MAC0, Next, Acc) ->
         I ->
             parse_rsp(Type, Next, [{Type, Key, Msg, I, MAC}|Acc])
     end.
+
+api_errors_ecdh(Config) when is_list(Config) ->
+    %% Check that we don't segfault when fed garbage.
+    Test = fun(Others, Curve) ->
+                   {_Pub, Priv} = crypto:generate_key(ecdh, Curve),
+                   crypto:compute_key(ecdh, Others, Priv, Curve)
+           end,
+    Others = [gurka, 0, <<0>>],
+    Curves = [gaffel, 0, sect571r1],
+    [_= (catch Test(O, C)) || O <- Others, C <- Curves],
+    ok.