mirror of
https://github.com/obgm/libcoap.git
synced 2026-11-17 21:39:04 +03:00
ASN1: Check for buffer overflows when determining tags and length
Include oss-fuzzer checks.
This commit is contained in:
1 parent
e57294c7e6
commit
210cbf378a
3 files changed
+79
-26
No files matched your search
@@ -29,6 +29,7 @@ extern "C" {
|
||||
*/
|
||||
|
||||
typedef enum {
|
||||
COAP_ASN1_FAIL = -1,
|
||||
COAP_ASN1_NONE = 0,
|
||||
COAP_ASN1_INTEGER = 2,
|
||||
COAP_ASN1_BITSTRING = 3,
|
||||
@@ -53,11 +54,13 @@ typedef int (*asn1_validate)(const uint8_t *data, size_t size);
|
||||
*
|
||||
* Internal function.
|
||||
*
|
||||
* @param ptr The current asn.1 object length pointer
|
||||
* @param ptr The current asn.1 object length pointer.
|
||||
* @param plen The current ptr size.
|
||||
*
|
||||
* @return The length of the asn.1 object. @p ptr is updated to be after the length.
|
||||
* @return The length of the asn.1 object. @p ptr is updated to be after the
|
||||
* length and plen is decremented as appropriate..
|
||||
*/
|
||||
size_t asn1_len(const uint8_t **ptr);
|
||||
size_t asn1_len(const uint8_t **ptr, size_t *plen);
|
||||
|
||||
/**
|
||||
* Get the asn1 tag from the current @p ptr.
|
||||
@@ -65,12 +68,14 @@ size_t asn1_len(const uint8_t **ptr);
|
||||
* Internal function.
|
||||
*
|
||||
* @param ptr The current asn.1 object tag pointer
|
||||
* @param constructed 1 if current tag is constructed
|
||||
* @param cls The current class of the tag
|
||||
* @param plen The current ptr size.
|
||||
* @param constructed Updated: 1 if current tag is constructed
|
||||
* @param cls Updated: The current class of the tag
|
||||
*
|
||||
* @return The tag value.@p ptr is updated to be after the tag.
|
||||
* @return The tag value. @p ptr is updated to be after the tag, and plen is
|
||||
* decremented as appropriate.
|
||||
*/
|
||||
coap_asn1_tag_t asn1_tag_c(const uint8_t **ptr, int *constructed, int *cls);
|
||||
coap_asn1_tag_t asn1_tag_c(const uint8_t **ptr, size_t *plen, int *constructed, int *cls);
|
||||
|
||||
/**
|
||||
* Get the asn1 tag and data from the current @p ptr.
|
||||
|
||||
+50
-19
@@ -1,12 +1,12 @@
|
||||
/* coap_asn1.c -- ASN.1 handling functions
|
||||
*
|
||||
* Copyright (C) 2020-2026 Jon Shallow <supjps-libcoap@jpshallow.com>
|
||||
*
|
||||
*
|
||||
* Copyright (C) 2020-2026 Jon Shallow <supjps-libcoap@jpshallow.com>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*
|
||||
* This file is part of the CoAP library libcoap. Please see
|
||||
* README for terms of use.
|
||||
*/
|
||||
* This file is part of the CoAP library libcoap. Please see
|
||||
* README for terms of use.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file coap_asn1.c
|
||||
@@ -16,46 +16,69 @@
|
||||
#include "coap3/coap_libcoap_build.h"
|
||||
|
||||
size_t
|
||||
asn1_len(const uint8_t **ptr) {
|
||||
asn1_len(const uint8_t **ptr, size_t *plen) {
|
||||
size_t len = 0;
|
||||
|
||||
if (*plen == 0)
|
||||
return 0;
|
||||
if ((**ptr) & 0x80) {
|
||||
size_t octets = (**ptr) & 0x7f;
|
||||
(*plen)--;
|
||||
(*ptr)++;
|
||||
while (octets) {
|
||||
if (*plen == 0)
|
||||
return 0;
|
||||
len = (len << 8) + (**ptr);
|
||||
(*plen)--;
|
||||
(*ptr)++;
|
||||
octets--;
|
||||
}
|
||||
} else {
|
||||
if (*plen == 0)
|
||||
return 0;
|
||||
len = (**ptr) & 0x7f;
|
||||
(*plen)--;
|
||||
(*ptr)++;
|
||||
}
|
||||
if (len > *plen)
|
||||
return *plen;
|
||||
return len;
|
||||
}
|
||||
|
||||
coap_asn1_tag_t
|
||||
asn1_tag_c(const uint8_t **ptr, int *constructed, int *cls) {
|
||||
asn1_tag_c(const uint8_t **ptr, size_t *plen, int *constructed, int *cls) {
|
||||
coap_asn1_tag_t tag = 0;
|
||||
uint8_t byte;
|
||||
|
||||
if (*plen == 0) {
|
||||
*constructed = 0;
|
||||
*cls = 0;
|
||||
return COAP_ASN1_FAIL;
|
||||
}
|
||||
byte = (**ptr);
|
||||
*constructed = (byte & 0x20) ? 1 : 0;
|
||||
*cls = byte >> 6;
|
||||
tag = byte & 0x1F;
|
||||
(*plen)--;
|
||||
(*ptr)++;
|
||||
if (tag < 0x1F)
|
||||
return tag;
|
||||
|
||||
/* Tag can be one byte or more based on B8 */
|
||||
if (*plen == 0)
|
||||
return COAP_ASN1_FAIL;
|
||||
byte = (**ptr);
|
||||
while (byte & 0x80) {
|
||||
tag = (tag << 7) + (byte & 0x7F);
|
||||
(*plen)--;
|
||||
(*ptr)++;
|
||||
if (*plen == 0)
|
||||
return COAP_ASN1_FAIL;
|
||||
byte = (**ptr);
|
||||
}
|
||||
/* Do the final one */
|
||||
tag = (tag << 7) + (byte & 0x7F);
|
||||
(*plen)--;
|
||||
(*ptr)++;
|
||||
return tag;
|
||||
}
|
||||
@@ -66,37 +89,45 @@ get_asn1_tag(coap_asn1_tag_t ltag, const uint8_t *ptr, size_t tlen,
|
||||
asn1_validate validate) {
|
||||
int constructed;
|
||||
int class;
|
||||
const uint8_t *acp = ptr;
|
||||
uint8_t tag = asn1_tag_c(&acp, &constructed, &class);
|
||||
size_t len = asn1_len(&acp);
|
||||
coap_asn1_tag_t tag = asn1_tag_c(&ptr, &tlen, &constructed, &class);
|
||||
size_t len;
|
||||
coap_binary_t *tag_data;
|
||||
|
||||
if (tag == COAP_ASN1_FAIL)
|
||||
return NULL;
|
||||
len = asn1_len(&ptr, &tlen);
|
||||
|
||||
while (tlen > 0 && len <= tlen) {
|
||||
if (class == 2 && constructed == 1) {
|
||||
/* Skip over element description */
|
||||
tag = asn1_tag_c(&acp, &constructed, &class);
|
||||
len = asn1_len(&acp);
|
||||
tag = asn1_tag_c(&ptr, &tlen, &constructed, &class);
|
||||
if (tag == COAP_ASN1_FAIL)
|
||||
return NULL;
|
||||
len = asn1_len(&ptr, &tlen);
|
||||
}
|
||||
if (tag == ltag) {
|
||||
if (!validate || validate(acp, len)) {
|
||||
if (!validate || validate(ptr, len)) {
|
||||
tag_data = coap_new_binary(len);
|
||||
if (tag_data == NULL)
|
||||
return NULL;
|
||||
tag_data->length = len;
|
||||
memcpy(tag_data->s, acp, len);
|
||||
memcpy(tag_data->s, ptr, len);
|
||||
return tag_data;
|
||||
}
|
||||
}
|
||||
if (tag == 0x10 && constructed == 1) {
|
||||
/* SEQUENCE or SEQUENCE OF */
|
||||
tag_data = get_asn1_tag(ltag, acp, len, validate);
|
||||
tag_data = get_asn1_tag(ltag, ptr, len, validate);
|
||||
if (tag_data)
|
||||
return tag_data;
|
||||
}
|
||||
acp += len;
|
||||
/* Skip over non matching tag */
|
||||
ptr += len;
|
||||
tlen -= len;
|
||||
tag = asn1_tag_c(&acp, &constructed, &class);
|
||||
len = asn1_len(&acp);
|
||||
tag = asn1_tag_c(&ptr, &tlen, &constructed, &class);
|
||||
if (tag == COAP_ASN1_FAIL)
|
||||
return NULL;
|
||||
len = asn1_len(&ptr, &tlen);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
#include "coap3/coap_internal.h"
|
||||
|
||||
int
|
||||
LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
|
||||
int i;
|
||||
|
||||
if (size < 1)
|
||||
return 0;
|
||||
|
||||
for (i = 0; i < 256; i++) {
|
||||
coap_binary_t *tag = get_asn1_tag(i, data, size, NULL);
|
||||
|
||||
coap_delete_binary(tag);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
Reference in new issue
Block a user