Skip to content

Commit 6581568

Browse files
committed
ASN.1: fix potential memory leak in error code paths
Reported-by: Conner Webber Signed-off-by: Stephan Mueller <[email protected]>
1 parent 07bec18 commit 6581568

7 files changed

Lines changed: 40 additions & 57 deletions

‎CHANGES.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ Changes 1.9.0-prerelease
3131

3232
* ABI change: lc_x509_cert_get_keyusage and lc_x509_cert_oid_to_eku
3333

34+
* fix potential memory leaks in ASN.1 in error code paths
35+
3436
Changes 1.8.0
3537
* X.509: provide a common automated serial number generator which is the 20 leftmost bytes of the SHA3-256 hash of the certificate DER blob with the serial number being 20 bytes of 0xff and the signature part equally a range of 0xff bytes
3638

‎asn1/src/asym_key_dilithium.c‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,12 @@ int public_key_verify_signature_dilithium(
5959
struct lc_dilithium_pk dilithium_pk;
6060
struct lc_dilithium_sig dilithium_sig;
6161
};
62-
int ret;
62+
int ret = 0;
6363
LC_DILITHIUM_CTX_ON_STACK(ctx);
6464
LC_DECLARE_MEM(ws, struct workspace, 64);
6565

6666
/* A signature verification does not work with a private key */
67-
if (pkey->key_is_private)
68-
return -EKEYREJECTED;
67+
CKRET(pkey->key_is_private, -EKEYREJECTED);
6968

7069
CKINT(lc_dilithium_pk_load(&ws->dilithium_pk, pkey->key, pkey->keylen));
7170
CKINT(lc_dilithium_sig_load(&ws->dilithium_sig, sig->s, sig->s_size));
@@ -387,14 +386,13 @@ int lc_x509_mldsa_private_key_seed(void *context, size_t hdrlen,
387386
uint8_t *dilithium_src_key;
388387
size_t dilithium_src_key_len;
389388
enum lc_dilithium_type dilithium_type = LC_DILITHIUM_UNKNOWN;
390-
int ret;
389+
int ret = 0;
391390
LC_DECLARE_MEM(ws, struct workspace, sizeof(uint64_t));
392391

393392
(void)hdrlen;
394393
(void)tag;
395394

396-
if (vlen != LC_X509_PQC_SK_SEED_SIZE)
397-
return -EBADMSG;
395+
CKRET((vlen != LC_X509_PQC_SK_SEED_SIZE), -EBADMSG);
398396

399397
printf_debug("Loaded ML-DSA secret seed of size %u\n",
400398
LC_X509_PQC_SK_SEED_SIZE);

‎asn1/src/asym_key_dilithium_ed25519.c‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,12 @@ int private_key_decode_dilithium_ed25519(struct lc_x509_key_data *keys,
8383
uint8_t *dilithium_src_key;
8484
size_t dilithium_src_key_len, ed25519_src_key_len;
8585
enum lc_dilithium_type dilithium_type = LC_DILITHIUM_UNKNOWN;
86-
int ret;
86+
int ret = 0;
8787
LC_DECLARE_MEM(ws, struct workspace, sizeof(uint64_t));
8888

89-
if (datalen != LC_ED25519_RAW_SECRETKEYBYTES + LC_X509_PQC_SK_SEED_SIZE)
90-
return -EINVAL;
89+
CKRET((datalen !=
90+
LC_ED25519_RAW_SECRETKEYBYTES + LC_X509_PQC_SK_SEED_SIZE),
91+
-EINVAL);
9192

9293
switch (keys->sig_type) {
9394
case LC_SIG_DILITHIUM_44_ED25519:
@@ -209,10 +210,9 @@ int public_key_decode_dilithium_ed25519(
209210
{
210211
const uint8_t *dilithium_src, *ed25519_src;
211212
size_t dilithium_src_len, ed25519_src_len;
212-
int ret;
213+
int ret = 0;
213214

214-
if (datalen < LC_ED25519_PUBLICKEYBYTES)
215-
return -EINVAL;
215+
CKRET(datalen < LC_ED25519_PUBLICKEYBYTES, -EINVAL);
216216

217217
/*
218218
* See draft version 5:
@@ -275,18 +275,16 @@ int public_key_verify_signature_dilithium_ed25519(
275275
};
276276
const uint8_t *dilithium_src, *ed25519_src, *data_ptr;
277277
size_t dilithium_src_len, ed25519_src_len, data_len;
278-
int ret, authattrs_tag;
278+
int ret = 0, authattrs_tag;
279279
LC_DECLARE_MEM(ws, struct workspace, 64);
280280

281281
/* A signature verification does not work with a private key */
282-
if (pkey->key_is_private)
283-
return -EKEYREJECTED;
282+
CKRET(pkey->key_is_private, -EKEYREJECTED);
284283

285284
CKINT(public_key_dilithium_ed25519_get_data(&data_ptr, &data_len,
286285
&authattrs_tag, sig));
287286

288-
if (sig->s_size < LC_ED25519_SIGBYTES)
289-
return -EINVAL;
287+
CKRET(sig->s_size < LC_ED25519_SIGBYTES, -EINVAL);
290288

291289
CKINT(public_key_decode_dilithium_ed25519(&ws->dilithium_pk, pkey->key,
292290
pkey->keylen));
@@ -423,8 +421,7 @@ int asym_set_dilithium_ed25519_keypair(struct lc_x509_key_data *gen_data,
423421

424422
CKNULL(gen_data, -EINVAL);
425423

426-
if (!pk && !sk)
427-
return -EINVAL;
424+
CKRET((!pk && !sk), -EINVAL);
428425

429426
if (pk) {
430427
dilithium_ed25519_type = lc_dilithium_ed25519_pk_type(pk);

‎asn1/src/asym_key_dilithium_ed448.c‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ int private_key_decode_dilithium_ed448(struct lc_x509_key_data *keys,
8686
uint8_t *dilithium_src_key;
8787
size_t dilithium_src_key_len, ed448_src_key_len;
8888
enum lc_dilithium_type dilithium_type = LC_DILITHIUM_UNKNOWN;
89-
int ret;
89+
int ret = 0;
9090
LC_DECLARE_MEM(ws, struct workspace, sizeof(uint64_t));
9191

92-
if (datalen != LC_ED448_SECRETKEYBYTES + LC_X509_PQC_SK_SEED_SIZE)
93-
return -EINVAL;
92+
CKRET((datalen != LC_ED448_SECRETKEYBYTES + LC_X509_PQC_SK_SEED_SIZE),
93+
-EINVAL);
9494

9595
/*
9696
* See draft version 5:
@@ -219,10 +219,9 @@ int public_key_decode_dilithium_ed448(
219219
{
220220
const uint8_t *dilithium_src, *ed448_src;
221221
size_t dilithium_src_len, ed448_src_len;
222-
int ret;
222+
int ret = 0;
223223

224-
if (datalen < LC_ED448_PUBLICKEYBYTES)
225-
return -EINVAL;
224+
CKRET((datalen < LC_ED448_PUBLICKEYBYTES), -EINVAL);
226225

227226
/*
228227
* See draft version 5:
@@ -285,18 +284,16 @@ int public_key_verify_signature_dilithium_ed448(
285284
};
286285
const uint8_t *dilithium_src, *ed448_src, *data_ptr;
287286
size_t dilithium_src_len, ed448_src_len, data_len;
288-
int ret, authattrs_tag;
287+
int ret = 0, authattrs_tag;
289288
LC_DECLARE_MEM(ws, struct workspace, 64);
290289

291290
/* A signature verification does not work with a private key */
292-
if (pkey->key_is_private)
293-
return -EKEYREJECTED;
291+
CKRET(pkey->key_is_private, -EKEYREJECTED);
294292

295293
CKINT(public_key_dilithium_ed448_get_data(&data_ptr, &data_len,
296294
&authattrs_tag, sig));
297295

298-
if (sig->s_size < LC_ED448_SIGBYTES)
299-
return -EINVAL;
296+
CKRET((sig->s_size < LC_ED448_SIGBYTES), -EINVAL);
300297

301298
CKINT(public_key_decode_dilithium_ed448(&ws->dilithium_pk, pkey->key,
302299
pkey->keylen));
@@ -431,8 +428,7 @@ int asym_set_dilithium_ed448_keypair(struct lc_x509_key_data *gen_data,
431428

432429
CKNULL(gen_data, -EINVAL);
433430

434-
if (!pk && !sk)
435-
return -EINVAL;
431+
CKRET((!pk && !sk), -EINVAL);
436432

437433
if (pk) {
438434
dilithium_ed448_type = lc_dilithium_ed448_pk_type(pk);

‎asn1/src/asym_key_ed25519.c‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,9 @@ int private_key_decode_ed25519(struct lc_x509_key_data *keys,
6363
int public_key_decode_ed25519(struct lc_ed25519_pk *ed25519_pk,
6464
const uint8_t *data, size_t datalen)
6565
{
66-
int ret;
66+
int ret = 0;
6767

68-
if (datalen != LC_ED25519_PUBLICKEYBYTES)
69-
return -EINVAL;
68+
CKRET((datalen != LC_ED25519_PUBLICKEYBYTES), -EINVAL);
7069

7170
CKINT(lc_ed25519_pk_load(ed25519_pk, data, LC_ED25519_PUBLICKEYBYTES));
7271

@@ -115,18 +114,16 @@ int public_key_verify_signature_ed25519(
115114
};
116115
const uint8_t *data_ptr;
117116
size_t data_len;
118-
int ret, authattrs_tag;
117+
int ret = 0, authattrs_tag;
119118
LC_DECLARE_MEM(ws, struct workspace, 64);
120119

121120
/* A signature verification does not work with a private key */
122-
if (pkey->key_is_private)
123-
return -EKEYREJECTED;
121+
CKRET(pkey->key_is_private, -EKEYREJECTED);
124122

125123
CKINT(public_key_ed25519_get_data(&data_ptr, &data_len, &authattrs_tag,
126124
sig));
127125

128-
if (sig->s_size != LC_ED25519_SIGBYTES)
129-
return -EBADMSG;
126+
CKRET((sig->s_size != LC_ED25519_SIGBYTES), -EBADMSG);
130127

131128
CKINT(public_key_decode_ed25519(&ws->pk, pkey->key, pkey->keylen));
132129

@@ -199,8 +196,7 @@ int asym_set_ed25519_keypair(struct lc_x509_key_data *gen_data,
199196

200197
CKNULL(gen_data, -EINVAL);
201198

202-
if (!pk && !sk)
203-
return -EINVAL;
199+
CKRET((!pk && !sk), -EINVAL);
204200

205201
if (pk) {
206202
gen_data->pk.ed25519_pk = pk;

‎asn1/src/asym_key_ed448.c‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,9 @@ int private_key_decode_ed448(struct lc_x509_key_data *keys, const uint8_t *data,
6363
int public_key_decode_ed448(struct lc_ed448_pk *ed448_pk, const uint8_t *data,
6464
size_t datalen)
6565
{
66-
int ret;
66+
int ret = 0;
6767

68-
if (datalen != LC_ED448_PUBLICKEYBYTES)
69-
return -EINVAL;
68+
CKRET((datalen != LC_ED448_PUBLICKEYBYTES), -EINVAL);
7069

7170
CKINT(lc_ed448_pk_load(ed448_pk, data, LC_ED448_PUBLICKEYBYTES));
7271

@@ -113,18 +112,16 @@ int public_key_verify_signature_ed448(const struct lc_public_key *pkey,
113112
};
114113
const uint8_t *data_ptr;
115114
size_t data_len;
116-
int ret, authattrs_tag;
115+
int ret = 0, authattrs_tag;
117116
LC_DECLARE_MEM(ws, struct workspace, 64);
118117

119118
/* A signature verification does not work with a private key */
120-
if (pkey->key_is_private)
121-
return -EKEYREJECTED;
119+
CKRET(pkey->key_is_private, -EKEYREJECTED);
122120

123121
CKINT(public_key_ed448_get_data(&data_ptr, &data_len, &authattrs_tag,
124122
sig));
125123

126-
if (sig->s_size != LC_ED448_SIGBYTES)
127-
return -EBADMSG;
124+
CKRET((sig->s_size != LC_ED448_SIGBYTES), -EBADMSG);
128125

129126
CKINT(public_key_decode_ed448(&ws->pk, pkey->key, pkey->keylen));
130127

@@ -196,8 +193,7 @@ int asym_set_ed448_keypair(struct lc_x509_key_data *gen_data,
196193

197194
CKNULL(gen_data, -EINVAL);
198195

199-
if (!pk && !sk)
200-
return -EINVAL;
196+
CKRET((!pk && !sk), -EINVAL);
201197

202198
if (pk) {
203199
gen_data->pk.ed448_pk = pk;

‎asn1/src/asym_key_sphincs.c‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,12 @@ int public_key_verify_signature_sphincs(
5757
struct lc_sphincs_pk sphincs_pk;
5858
struct lc_sphincs_sig sphincs_sig;
5959
};
60-
int ret;
60+
int ret = 0;
6161
LC_SPHINCS_CTX_ON_STACK(ctx);
6262
LC_DECLARE_MEM(ws, struct workspace, 64);
6363

6464
/* A signature verification does not work with a private key */
65-
if (pkey->key_is_private)
66-
return -EKEYREJECTED;
65+
CKRET(pkey->key_is_private, -EKEYREJECTED);
6766

6867
CKINT(lc_sphincs_pk_load(&ws->sphincs_pk, pkey->key, pkey->keylen));
6968
if (fast) {
@@ -286,8 +285,7 @@ int asym_set_sphincs_keypair(struct lc_x509_key_data *gen_data,
286285

287286
CKNULL(gen_data, -EINVAL);
288287

289-
if (!pk && !sk)
290-
return -EINVAL;
288+
CKRET((!pk && !sk), -EINVAL);
291289

292290
if (pk) {
293291
sphincs_type = lc_sphincs_pk_type(pk);

0 commit comments

Comments
 (0)