Add missing length octet for NSEC3 RR

Author: k0ekk0ek

src/generic/base16.h

@@ -286,7 +286,7 @@ static really_inline int32_t parse_salt(
   size_t length = token->length / 2;
   uint8_t *octets = rdata->octets++;
   // FIXME: not quite right yet! we must not exceed 255 octets!
-  if ((uintptr_t)rdata->limit - (uintptr_t)rdata->octets < length)
+  if ((uintptr_t)rdata->limit - (uintptr_t)rdata->octets < (length + 1))
     SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), NAME(type));
   if (!base16_decode(token->data, token->length, rdata->octets, &length))
     SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), NAME(type));

src/generic/base32.h

@@ -50,12 +50,18 @@ nonnull_all
 static really_inline int32_t parse_base32(
   parser_t *parser,
   const type_info_t *type,
-  const rdata_info_t *item,
+  const rdata_info_t *field,
   rdata_t *rdata,
   const token_t *token)
 {
   uint32_t state = 0;
 
+  size_t length = (token->length * 5) / 8;
+  if (length > 255 || (uintptr_t)rdata->limit - (uintptr_t)rdata->octets < (length + 1))
+    SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), NAME(type));
+
+  *rdata->octets++ = (uint8_t)length;
+
   const char *p = token->data;
   for (;; p++) {
     const uint8_t ofs = b32rmap[(uint8_t)*p];
@@ -104,7 +110,7 @@ static really_inline int32_t parse_base32(
   }
 
   if (p != token->data + token->length)
-    SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(item), NAME(type));
+    SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), NAME(type));
   return 0;
 }
 

src/haswell/base32.h

@@ -85,13 +85,14 @@ static really_inline int32_t parse_base32(
   const token_t *token)
 {
   size_t length = (token->length * 5) / 8;
-  if ((uintptr_t)rdata->limit - (uintptr_t)rdata->octets < length)
+  if (length > 255 || (uintptr_t)rdata->limit - (uintptr_t)rdata->octets < (length + 1))
     SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), NAME(type));
 
-  size_t decoded = base32hex_avx(rdata->octets, (const uint8_t*)token->data);
+  size_t decoded = base32hex_avx(rdata->octets+1, (const uint8_t*)token->data);
   if (decoded != token->length)
     SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), NAME(type));
-  rdata->octets += length;
+  *rdata->octets = (uint8_t)length;
+  rdata->octets += 1 + length;
   return 0;
 }
 

src/westmere/base32.h

@@ -74,13 +74,14 @@ static really_inline int32_t parse_base32(
   const token_t *token)
 {
   size_t length = (token->length * 5) / 8;
-  if ((uintptr_t)rdata->limit - (uintptr_t)rdata->octets < length)
+  if (length > 255 || (uintptr_t)rdata->limit - (uintptr_t)rdata->octets < (length + 1))
     SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), NAME(type));
 
-  size_t decoded = base32hex_sse(rdata->octets, (const uint8_t*)token->data);
+  size_t decoded = base32hex_sse(rdata->octets+1, (const uint8_t*)token->data);
   if (decoded != token->length)
     SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), NAME(type));
-  rdata->octets += length;
+  *rdata->octets = (uint8_t)length;
+  rdata->octets += 1 + length;
   return 0;
 }
 

tests/base32.c

@@ -36,7 +36,7 @@ static int32_t add_rr(
 }
 
 static const uint8_t foobar[] =
-  { 'f', 'o', 'o', 'b', 'a', 'r' };
+  { 6, 'f', 'o', 'o', 'b', 'a', 'r' };
 
 static uint8_t origin[] =
   { 7, 'e', 'x', 'a', 'm', 'p', 'l', 'e', 3, 'c', 'o', 'm', 0 };