[openssl/openssl] 5e4c3f: Detect and prevent recursive config parsing

Neil Horman noreply at github.com
Sat Dec 30 14:26:54 UTC 2023


  Branch: refs/heads/openssl-3.0
  Home:   https://github.com/openssl/openssl
  Commit: 5e4c3f2b3911b61a0e77b63e1e63f80c7581fb96
      https://github.com/openssl/openssl/commit/5e4c3f2b3911b61a0e77b63e1e63f80c7581fb96
  Author: Neil Horman <nhorman at openssl.org>
  Date:   2023-12-30 (Sat, 30 Dec 2023)

  Changed paths:
    M crypto/conf/conf_err.c
    M crypto/err/openssl.txt
    M crypto/provider_conf.c
    M include/openssl/conferr.h
    M test/prov_config_test.c
    M test/recipes/30-test_prov_config.t
    A test/recursive.cnf

  Log Message:
  -----------
  Detect and prevent recursive config parsing

If a malformed config file is provided such as the following:

openssl_conf = openssl_init
[openssl_init]
providers = provider_sect
[provider_sect]
 = provider_sect

The config parsing library will crash overflowing the stack, as it
recursively parses the same provider_sect ad nauseum.

Prevent this by maintaing a list of visited nodes as we recurse through
referenced sections, and erroring out in the event we visit any given
section node more than once.

Note, adding the test for this revealed that our diagnostic code
inadvertently pops recorded errors off the error stack because
provider_conf_load returns success even in the event that a
configuration parse failed. The call path to provider_conf_load has been
updated in this commit to address that shortcoming, allowing recorded
errors to be visibile to calling applications.

Reviewed-by: Tomas Mraz <tomas at openssl.org>
Reviewed-by: Matt Caswell <matt at openssl.org>
Reviewed-by: Todd Short <todd.short at me.com>
(Merged from https://github.com/openssl/openssl/pull/23120)




More information about the openssl-commits mailing list