diff options
author | Nick Mathewson <nickm@torproject.org> | 2021-03-15 08:53:36 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2021-03-15 08:53:36 -0400 |
commit | efca9ce41c96bb0044f504ced36a2734b1689ee2 (patch) | |
tree | ea9f1d5cdb28da2871a6e84886e5199647cc4cfd | |
parent | f46f4562cf6f47fe6c00752f61b04dc18a454253 (diff) | |
download | tor-efca9ce41c96bb0044f504ced36a2734b1689ee2.tar.gz tor-efca9ce41c96bb0044f504ced36a2734b1689ee2.zip |
Clarify new intended strategy with TROVE-2021-001
We're going to disable this feature in all versions for now.
-rw-r--r-- | changes/ticket40286_minimal | 7 | ||||
-rw-r--r-- | src/feature/dirparse/unparseable.c | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/changes/ticket40286_minimal b/changes/ticket40286_minimal index b8669debaa..6a04ca79eb 100644 --- a/changes/ticket40286_minimal +++ b/changes/ticket40286_minimal @@ -1,5 +1,6 @@ - o Major bugfixes (denial of service): + o Major bugfixes (security, denial of service): - Disable the dump_desc() function that we used to dump unparseable information to disk. It was called incorrectly in several places, - in a way that could lead to excessive CPU usage. - Fixes bug 40286; bugfix on 0.2.2.1-alpha. + in a way that could lead to excessive CPU usage. Fixes bug 40286; + bugfix on 0.2.2.1-alpha. This bug is also tracked as + TROVE-2021-001 and CVE-2021-28089. diff --git a/src/feature/dirparse/unparseable.c b/src/feature/dirparse/unparseable.c index a547335452..1d623fe701 100644 --- a/src/feature/dirparse/unparseable.c +++ b/src/feature/dirparse/unparseable.c @@ -493,8 +493,11 @@ dump_desc,(const char *desc, const char *type)) tor_assert(desc); tor_assert(type); #ifndef TOR_UNIT_TESTS - /* On older versions of Tor we are disabling this function, since it - * can be called with strings that are far too long. */ + /* For now, we are disabling this function, since it can be called with + * strings that are far too long. We can turn it back on if we fix it + * someday, but we'd need to give it a length argument. A likelier + * resolution here is simply to remove this module entirely. See tor#40286 + * for background. */ if (1) return; #endif |