diff --git a/library/x509_csr.c b/library/x509_csr.c
index 45b7b8f9ac..28a4560c43 100644
--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@@ -253,11 +253,8 @@ static int x509_csr_parse_attributes(mbedtls_x509_csr *csr,
             if ((ret = x509_csr_parse_extensions(csr, p, end_exts, cb, p_ctx)) != 0) {
                 return ret;
             }
-
-            if (*p != end_attr_data) {
-                return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_X509_INVALID_EXTENSIONS,
-                                         MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);
-            }
+            /* x509_csr_parse_extensions() guarantees *p == end_exts
+             * on success */
         }
 
         *p = end_attr_data;