Avoid a potential overread in x509_constraints_parse_mailbox()

The length checks need to be >= rather than > in order to ensure the string
remains NUL terminated. While here consistently check wi before using it
so we have the same idiom throughout this function.

Issue reported by GoldBinocle on GitHub.

ok deraadt@ tb@

this is 6.8 errata 031

1 files changed, 9 insertions, 5 deletions

diff --git a/src/lib/libcrypto/x509/x509_constraints.c b/src/lib/libcrypto/x509/x509_constraints.c
index 5659d6e6a7..f84013e299 100644
--- a/src/lib/libcrypto/x509/x509_constraints.c
+++ b/src/lib/libcrypto/x509/x509_constraints.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_constraints.c,v 1.10 2020/09/21 05:41:43 tb Exp $ */
+/* $OpenBSD: x509_constraints.c,v 1.10.4.1 2021/09/26 14:07:09 deraadt Exp $ */
 /*
  * Copyright (c) 2020 Bob Beck <beck@openbsd.org>
  *
@@ -323,16 +323,16 @@ x509_constraints_parse_mailbox(uint8_t *candidate, size_t len,
                         if (c == '.')
                                 goto bad;
                 }
-                if (wi > DOMAIN_PART_MAX_LEN)
-                        goto bad;
                 if (accept) {
+                        if (wi >= DOMAIN_PART_MAX_LEN)
+                                goto bad;
                         working[wi++] = c;
                         accept = 0;
                         continue;
                 }
                 if (candidate_local != NULL) {
                         /* We are looking for the domain part */
-                        if (wi > DOMAIN_PART_MAX_LEN)
+                        if (wi >= DOMAIN_PART_MAX_LEN)
                                 goto bad;
                         working[wi++] = c;
                         if (i == len - 1) {
@@ -347,7 +347,7 @@ x509_constraints_parse_mailbox(uint8_t *candidate, size_t len,
                         continue;
                 }
                 /* We are looking for the local part */
-                if (wi > LOCAL_PART_MAX_LEN)
+                if (wi >= LOCAL_PART_MAX_LEN)
                         break;
 
                 if (quoted) {
@@ -367,6 +367,8 @@ x509_constraints_parse_mailbox(uint8_t *candidate, size_t len,
                          */
                         if (c == 9)
                                 goto bad;
+                        if (wi >= LOCAL_PART_MAX_LEN)
+                                goto bad;
                         working[wi++] = c;
                         continue; /* all's good inside our quoted string */
                 }
@@ -396,6 +398,8 @@ x509_constraints_parse_mailbox(uint8_t *candidate, size_t len,
                 }
                 if (!local_part_ok(c))
                         goto bad;
+                if (wi >= LOCAL_PART_MAX_LEN)
+                        goto bad;
                 working[wi++] = c;
         }
         if (candidate_local == NULL || candidate_domain == NULL)