security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

kbx: Fix detection of corrupted keyblocks on 32 bit systems.

Browse Source 
* kbx/keybox-search.c (blob_cmp_fpr): Avoid overflow in OFF+LEN
checking.
(blob_cmp_fpr_part): Ditto.
(blob_cmp_name): Ditto.
(blob_cmp_mail): Ditto.
(blob_x509_has_grip): Ditto.
(keybox_get_keyblock): Check OFF and LEN using a 64 bit var.
(keybox_get_cert): Ditto.
--

On most 32 bit systems size_t is 32 bit and thus the check

  size_t cert_off = get32 (buffer+8);
  size_t cert_len = get32 (buffer+12);
  if (cert_off+cert_len > length)
    return gpg_error (GPG_ERR_TOO_SHORT);

does not work as intended for all supplied values.  The simplest
solution here is to cast them to 64 bit.

In general it will be better to avoid size_t at all and work with
uint64_t.  We did not do this in the past because uint64_t was not
universally available.

GnuPG-bug-id: 3770
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2018-02-15 11:17:28 +01:00
parent ca138d5bf3
commit 5e3679ae39
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kbx/keybox-search.c
View File

@ -247,7 +247,7 @@ blob_cmp_fpr (KEYBOXBLOB blob, const unsigned char *fpr)
if (keyinfolen < 28) if (keyinfolen < 28)
return 0; /* invalid blob */ return 0; /* invalid blob */
pos = 20; pos = 20;
if (pos + keyinfolen*nkeys > length) if (pos + (uint64_t)keyinfolen*nkeys > (uint64_t)length)
return 0; /* out of bounds */ return 0; /* out of bounds */
for (idx=0; idx < nkeys; idx++) for (idx=0; idx < nkeys; idx++)
@ -279,7 +279,7 @@ blob_cmp_fpr_part (KEYBOXBLOB blob, const unsigned char *fpr,
if (keyinfolen < 28) if (keyinfolen < 28)
return 0; /* invalid blob */ return 0; /* invalid blob */
pos = 20; pos = 20;
if (pos + keyinfolen*nkeys > length) if (pos + (uint64_t)keyinfolen*nkeys > (uint64_t)length)
return 0; /* out of bounds */ return 0; /* out of bounds */
for (idx=0; idx < nkeys; idx++) for (idx=0; idx < nkeys; idx++)
@ -313,7 +313,7 @@ blob_cmp_name (KEYBOXBLOB blob, int idx,
if (keyinfolen < 28) if (keyinfolen < 28)
return 0; /* invalid blob */ return 0; /* invalid blob */
pos = 20 + keyinfolen*nkeys; pos = 20 + keyinfolen*nkeys;
if (pos+2 > length) if ((uint64_t)pos+2 > (uint64_t)length)
return 0; /* out of bounds */ return 0; /* out of bounds */
/*serial*/ /*serial*/
@ -340,7 +340,7 @@ blob_cmp_name (KEYBOXBLOB blob, int idx,
mypos += idx*uidinfolen; mypos += idx*uidinfolen;
off = get32 (buffer+mypos); off = get32 (buffer+mypos);
len = get32 (buffer+mypos+4); len = get32 (buffer+mypos+4);
if (off+len > length) if ((uint64_t)off+(uint64_t)len > (uint64_t)length)
return 0; /* error: better stop here out of bounds */ return 0; /* error: better stop here out of bounds */
if (len < 1) if (len < 1)
continue; /* empty name */ continue; /* empty name */
@ -439,7 +439,7 @@ blob_cmp_mail (KEYBOXBLOB blob, const char *name, size_t namelen, int substr,
mypos += idx*uidinfolen; mypos += idx*uidinfolen;
off = get32 (buffer+mypos); off = get32 (buffer+mypos);
len = get32 (buffer+mypos+4); len = get32 (buffer+mypos+4);
if (off+len > length) if ((uint64_t)off+(uint64_t)len > (uint64_t)length)
return 0; /* error: better stop here - out of bounds */ return 0; /* error: better stop here - out of bounds */
if (x509) if (x509)
{ {
@ -522,7 +522,7 @@ blob_x509_has_grip (KEYBOXBLOB blob, const unsigned char *grip)
return 0; /* Too short. */ return 0; /* Too short. */
cert_off = get32 (buffer+8); cert_off = get32 (buffer+8);
cert_len = get32 (buffer+12); cert_len = get32 (buffer+12);
if (cert_off+cert_len > length) if ((uint64_t)cert_off+(uint64_t)cert_len > (uint64_t)length)
return 0; /* Too short. */ return 0; /* Too short. */
rc = ksba_reader_new (&reader); rc = ksba_reader_new (&reader);
@ -1097,7 +1097,7 @@ keybox_get_keyblock (KEYBOX_HANDLE hd, iobuf_t *r_iobuf,
return gpg_error (GPG_ERR_TOO_SHORT); return gpg_error (GPG_ERR_TOO_SHORT);
image_off = get32 (buffer+8); image_off = get32 (buffer+8);
image_len = get32 (buffer+12); image_len = get32 (buffer+12);
if (image_off+image_len > length) if ((uint64_t)image_off+(uint64_t)image_len > (uint64_t)length)
return gpg_error (GPG_ERR_TOO_SHORT); return gpg_error (GPG_ERR_TOO_SHORT);
err = _keybox_get_flag_location (buffer, length, KEYBOX_FLAG_SIG_INFO, err = _keybox_get_flag_location (buffer, length, KEYBOX_FLAG_SIG_INFO,
@ -1139,7 +1139,7 @@ keybox_get_cert (KEYBOX_HANDLE hd, ksba_cert_t *r_cert)
return gpg_error (GPG_ERR_TOO_SHORT); return gpg_error (GPG_ERR_TOO_SHORT);
cert_off = get32 (buffer+8); cert_off = get32 (buffer+8);
cert_len = get32 (buffer+12); cert_len = get32 (buffer+12);
if (cert_off+cert_len > length) if ((uint64_t)cert_off+(uint64_t)cert_len > (uint64_t)length)
return gpg_error (GPG_ERR_TOO_SHORT); return gpg_error (GPG_ERR_TOO_SHORT);
rc = ksba_reader_new (&reader); rc = ksba_reader_new (&reader);