diff options
| author | Werner Koch <[email protected]> | 2022-04-25 13:21:05 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2022-04-25 13:29:11 +0000 |
| commit | 86d84464ae11666b1556e876a41a65cec8daaf18 (patch) | |
| tree | a27394e719e9c84f49855f86e74e33168d6fda37 | |
| parent | agent: Not writing password into file. (diff) | |
| download | gnupg-86d84464ae11666b1556e876a41a65cec8daaf18.tar.gz gnupg-86d84464ae11666b1556e876a41a65cec8daaf18.zip | |
gpg: Avoid NULL ptr access due to corrupted packets.
* g10/parse-packet.c (parse_signature): Do not create an opaque MPI
with NULL and length > 0
(parse_key): Ditto.
--
GnuPG-bug-id: 5940, 5946
| -rw-r--r-- | g10/parse-packet.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 9f8b45813..6a529707a 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -2290,8 +2290,10 @@ parse_signature (IOBUF inp, int pkttype, unsigned long pktlen, } else { - sig->data[0] = - gcry_mpi_set_opaque (NULL, read_rest (inp, pktlen), pktlen * 8); + void *tmpp; + + tmpp = read_rest (inp, pktlen); + sig->data[0] = gcry_mpi_set_opaque (NULL, tmpp, tmpp? pktlen * 8 : 0); pktlen = 0; } } @@ -2499,8 +2501,10 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen, if (!npkey) { /* Unknown algorithm - put data into an opaque MPI. */ - pk->pkey[0] = gcry_mpi_set_opaque (NULL, - read_rest (inp, pktlen), pktlen * 8); + void *tmpp = read_rest (inp, pktlen); + /* Current gcry_mpi_cmp does not handle a (NULL,n>0) nicely and + * thus we avoid to create such an MPI. */ + pk->pkey[0] = gcry_mpi_set_opaque (NULL, tmpp, tmpp? pktlen * 8 : 0); pktlen = 0; goto leave; } @@ -2764,6 +2768,8 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen, } else if (ski->is_protected) { + void *tmpp; + if (pktlen < 2) /* At least two bytes for the length. */ { err = gpg_error (GPG_ERR_INV_PACKET); @@ -2773,9 +2779,10 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen, /* Ugly: The length is encrypted too, so we read all stuff * up to the end of the packet into the first SKEY * element. */ + + tmpp = read_rest (inp, pktlen); pk->pkey[npkey] = gcry_mpi_set_opaque (NULL, - read_rest (inp, pktlen), - pktlen * 8); + tmpp, tmpp? pktlen * 8 : 0); /* Mark that MPI as protected - we need this information for importing a key. The OPAQUE flag can't be used because we also store public EdDSA values in opaque MPIs. */ |