3367. [bug] dns_dnsseckey_create() result was not being checked.

                        [RT #30685]

diff --git a/CHANGES b/CHANGES
index 2e8bb8fd9d9b76eeb4ff71758fbf29d1e79f871f..9b3bdae9f2f9abbbd97b326798bdb9a2840ff18f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3367.  [bug]           dns_dnsseckey_create() result was not being checked.
+                       [RT #30685]
+
 3366.  [bug]           Fixed Read-After-Write dependency violation for IA64 
                        atomic operations. [RT #25181]
 

diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index 1a8ab1a401d06dbed92f80be2b27196fadedb878..2995fddebf73908a170d129dd170a006ec8d7538 100644 (file)
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -1401,11 +1401,12 @@ dns_dnssec_findmatchingkeys(dns_name_t *origin, const char *directory,
  * the keys in the keyset, regardless of whether they have
  * metadata indicating they should be deactivated or removed.
  */
-static void
+static isc_result_t
 addkey(dns_dnsseckeylist_t *keylist, dst_key_t **newkey,
        isc_boolean_t savekeys, isc_mem_t *mctx)
 {
        dns_dnsseckey_t *key;
+       isc_result_t result;
 
        /* Skip duplicates */
        for (key = ISC_LIST_HEAD(*keylist);
@@ -1433,10 +1434,12 @@ addkey(dns_dnsseckeylist_t *keylist, dst_key_t **newkey,
                }
 
                key->source = dns_keysource_zoneapex;
-               return;
+               return (ISC_R_SUCCESS);
        }
 
-       dns_dnsseckey_create(mctx, newkey, &key);
+       result = dns_dnsseckey_create(mctx, newkey, &key);
+       if (result != ISC_R_SUCCESS)
+               return (result);
        if (key->legacy || savekeys) {
                key->force_publish = ISC_TRUE;
                key->force_sign = dst_key_isprivate(key->key);
@@ -1444,6 +1447,7 @@ addkey(dns_dnsseckeylist_t *keylist, dst_key_t **newkey,
        key->source = dns_keysource_zoneapex;
        ISC_LIST_APPEND(*keylist, key, link);
        *newkey = NULL;
+       return (ISC_R_SUCCESS);
 }
 
 
@@ -1534,7 +1538,7 @@ dns_dnssec_keylistfromrdataset(dns_name_t *origin,
                        goto skip;
 
                if (public) {
-                       addkey(keylist, &pubkey, savekeys, mctx);
+                       RETERR(addkey(keylist, &pubkey, savekeys, mctx));
                        goto skip;
                }
 
@@ -1587,7 +1591,7 @@ dns_dnssec_keylistfromrdataset(dns_name_t *origin,
                }
 
                if (result == ISC_R_FILENOTFOUND || result == ISC_R_NOPERM) {
-                       addkey(keylist, &pubkey, savekeys, mctx);
+                       RETERR(addkey(keylist, &pubkey, savekeys, mctx));
                        goto skip;
                }
                RETERR(result);
@@ -1602,7 +1606,7 @@ dns_dnssec_keylistfromrdataset(dns_name_t *origin,
                 */
                dst_key_setttl(privkey, dst_key_getttl(pubkey));
 
-               addkey(keylist, &privkey, savekeys, mctx);
+               RETERR(addkey(keylist, &privkey, savekeys, mctx));
  skip:
                if (pubkey != NULL)
                        dst_key_free(&pubkey);