March 2020 - tor-commits - lists.torproject.org

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit b2e543bfe74bb5855a86429c61c0efc91d660719 Merge: c96cf1494 b9d71f384 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:46:16 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 changes/bug33093_logging | 5 +++++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit b2e543bfe74bb5855a86429c61c0efc91d660719 Merge: c96cf1494 b9d71f384 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:46:16 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 changes/bug33093_logging | 5 +++++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.3] Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit b9d71f3848a2858dc0a3c5232c85d97525aacd25 Merge: add387c50 1f163fcbd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:46:09 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5 changes/bug33093_logging | 5 +++++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit 938487d4b427888fe554dc158888e52fca279783 Merge: f68663191 6ed2c9e5f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:46:16 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit b9d71f3848a2858dc0a3c5232c85d97525aacd25 Merge: add387c50 1f163fcbd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:46:09 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5 changes/bug33093_logging | 5 +++++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit b2e543bfe74bb5855a86429c61c0efc91d660719 Merge: c96cf1494 b9d71f384 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:46:16 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 changes/bug33093_logging | 5 +++++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit 6ed2c9e5fa8c4699cd55bae51248ae24c4d43d3f Merge: b50494233 b2e543bfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:46:16 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/bug33093_logging | 5 +++++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.3'
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit 87d01b0a904739bc8a0ef485c57ae994583e0309 Merge: 3168b4485 938487d4b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:46:16 2020 -0400 Merge branch 'maint-0.4.3'

1 0

[tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit 938487d4b427888fe554dc158888e52fca279783 Merge: f68663191 6ed2c9e5f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:46:16 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/release-0.3.5] Change BUG() messages in buf_flush_to_tls() to IF_BUG_ONCE()
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit 1f163fcbde4591bcb5764d6bbe0fea8aa559fc33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 29 08:31:22 2020 -0500 Change BUG() messages in buf_flush_to_tls() to IF_BUG_ONCE() We introduced these BUG() checks in b0ddaac07428a06 to prevent a recurrence of bug 23690. But there's a report of the BUG() message getting triggered and filling up the disk. Let's change it to IF_BUG_ONCE(). Fixes bug 33093; bugfix on 0.3.2.2-alpha. --- changes/bug33093_logging | 5 +++++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug33093_logging b/changes/bug33093_logging new file mode 100644 index 000000000..e26e4a64a --- /dev/null +++ b/changes/bug33093_logging @@ -0,0 +1,5 @@ + o Minor bugfixes (logging): + - If we encounter a bug when flushing a buffer to a TLS connection, + only log the bug once per invocation of the Tor process. Previously we + would log with every occurrence, which could cause us to run out of + disk space. Fixes bug 33093; bugfix on 0.3.2.2-alpha. diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c index e92cb9163..b570216df 100644 --- a/src/lib/tls/buffers_tls.c +++ b/src/lib/tls/buffers_tls.c @@ -146,10 +146,10 @@ buf_flush_to_tls(buf_t *buf, tor_tls_t *tls, size_t flushlen, size_t flushed = 0; ssize_t sz; tor_assert(buf_flushlen); - if (BUG(*buf_flushlen > buf->datalen)) { + IF_BUG_ONCE(*buf_flushlen > buf->datalen) { *buf_flushlen = buf->datalen; } - if (BUG(flushlen > *buf_flushlen)) { + IF_BUG_ONCE(flushlen > *buf_flushlen) { flushlen = *buf_flushlen; } sz = (ssize_t) flushlen;

1 0