July 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 431c8d09ee062621d8b826799a667f746a783103 Merge: 30a98c765 18734d3b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 12:58:22 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23030_029 | 7 +++++++ src/common/util_bug.h | 13 +++++++++++++ 2 files changed, 20 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 3ada086d380845b11e6f35cfde93a02bf2dbbb6e Merge: 745ffd6d3 431c8d09e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 12:58:22 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23030_029 | 7 +++++++ src/common/util_bug.h | 13 +++++++++++++ 2 files changed, 20 insertions(+)

1 0

[tor/maint-0.2.9] Fix build warnings from Coverity related to our BUG macro
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 32b9edeb91a7d9b9752083622d1ce400f45e42ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 25 10:14:24 2017 -0400 Fix build warnings from Coverity related to our BUG macro In the Linux kernel, the BUG() macro causes an instant panic. Our BUG() macro is different, however: it generates a nonfatal assertion failure, and is usable as an expression. Additionally, this patch tells util_bug.h to make all assertion failures into fatal conditions when we're building with a static analysis tool, so that the analysis tool can look for instances where they're reachable. Fixes bug 23030. --- changes/bug23030_029 | 7 +++++++ src/common/util_bug.h | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/changes/bug23030_029 b/changes/bug23030_029 new file mode 100644 index 000000000..89a1b507d --- /dev/null +++ b/changes/bug23030_029 @@ -0,0 +1,7 @@ + o Minor bugfixes (coverity builds): + - Avoid Coverity build warnings related to our BUG() macro. By + default, Coverity treats BUG() as the Linux kernel does: an + instant abort(). We need to override that so our BUG() macro + doesn't prevent Coverity from analyzing functions that use it. + Fixes bug 23030; bugfix on 0.2.9.1-alpha. + diff --git a/src/common/util_bug.h b/src/common/util_bug.h index e02778110..069580691 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -58,6 +58,19 @@ * return -1; */ +#ifdef __COVERITY__ +#undef BUG +// Coverity defines this in global headers; let's override it. This is a +// magic coverity-only preprocessor thing. +#nodef BUG(x) ((x)?(__coverity_panic__(),1):0) +#endif + +#if defined(__COVERITY__) || defined(__clang_analyzer__) +// We're running with a static analysis tool: let's treat even nonfatal +// assertion failures as something that we need to avoid. +#define ALL_BUGS_ARE_FATAL +#endif + #ifdef ALL_BUGS_ARE_FATAL #define tor_assert_nonfatal_unreached() tor_assert(0) #define tor_assert_nonfatal(cond) tor_assert((cond))

1 0

[tor/maint-0.2.9] Merge branch 'bug23030_029_v2' into maint-0.2.9
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 0117e2ea0dc09408e2fbc7224e335968af009874 Merge: 6d3c5b8fb 32b9edeb9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 12:58:17 2017 -0400 Merge branch 'bug23030_029_v2' into maint-0.2.9 changes/bug23030_029 | 7 +++++++ src/common/util_bug.h | 13 +++++++++++++ 2 files changed, 20 insertions(+)

1 0

[tor/maint-0.3.0] Fix build warnings from Coverity related to our BUG macro
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 32b9edeb91a7d9b9752083622d1ce400f45e42ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 25 10:14:24 2017 -0400 Fix build warnings from Coverity related to our BUG macro In the Linux kernel, the BUG() macro causes an instant panic. Our BUG() macro is different, however: it generates a nonfatal assertion failure, and is usable as an expression. Additionally, this patch tells util_bug.h to make all assertion failures into fatal conditions when we're building with a static analysis tool, so that the analysis tool can look for instances where they're reachable. Fixes bug 23030. --- changes/bug23030_029 | 7 +++++++ src/common/util_bug.h | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/changes/bug23030_029 b/changes/bug23030_029 new file mode 100644 index 000000000..89a1b507d --- /dev/null +++ b/changes/bug23030_029 @@ -0,0 +1,7 @@ + o Minor bugfixes (coverity builds): + - Avoid Coverity build warnings related to our BUG() macro. By + default, Coverity treats BUG() as the Linux kernel does: an + instant abort(). We need to override that so our BUG() macro + doesn't prevent Coverity from analyzing functions that use it. + Fixes bug 23030; bugfix on 0.2.9.1-alpha. + diff --git a/src/common/util_bug.h b/src/common/util_bug.h index e02778110..069580691 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -58,6 +58,19 @@ * return -1; */ +#ifdef __COVERITY__ +#undef BUG +// Coverity defines this in global headers; let's override it. This is a +// magic coverity-only preprocessor thing. +#nodef BUG(x) ((x)?(__coverity_panic__(),1):0) +#endif + +#if defined(__COVERITY__) || defined(__clang_analyzer__) +// We're running with a static analysis tool: let's treat even nonfatal +// assertion failures as something that we need to avoid. +#define ALL_BUGS_ARE_FATAL +#endif + #ifdef ALL_BUGS_ARE_FATAL #define tor_assert_nonfatal_unreached() tor_assert(0) #define tor_assert_nonfatal(cond) tor_assert((cond))

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 431c8d09ee062621d8b826799a667f746a783103 Merge: 30a98c765 18734d3b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 12:58:22 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23030_029 | 7 +++++++ src/common/util_bug.h | 13 +++++++++++++ 2 files changed, 20 insertions(+)

1 0

[tor/release-0.2.9] Fix build warnings from Coverity related to our BUG macro
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 32b9edeb91a7d9b9752083622d1ce400f45e42ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 25 10:14:24 2017 -0400 Fix build warnings from Coverity related to our BUG macro In the Linux kernel, the BUG() macro causes an instant panic. Our BUG() macro is different, however: it generates a nonfatal assertion failure, and is usable as an expression. Additionally, this patch tells util_bug.h to make all assertion failures into fatal conditions when we're building with a static analysis tool, so that the analysis tool can look for instances where they're reachable. Fixes bug 23030. --- changes/bug23030_029 | 7 +++++++ src/common/util_bug.h | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/changes/bug23030_029 b/changes/bug23030_029 new file mode 100644 index 000000000..89a1b507d --- /dev/null +++ b/changes/bug23030_029 @@ -0,0 +1,7 @@ + o Minor bugfixes (coverity builds): + - Avoid Coverity build warnings related to our BUG() macro. By + default, Coverity treats BUG() as the Linux kernel does: an + instant abort(). We need to override that so our BUG() macro + doesn't prevent Coverity from analyzing functions that use it. + Fixes bug 23030; bugfix on 0.2.9.1-alpha. + diff --git a/src/common/util_bug.h b/src/common/util_bug.h index e02778110..069580691 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -58,6 +58,19 @@ * return -1; */ +#ifdef __COVERITY__ +#undef BUG +// Coverity defines this in global headers; let's override it. This is a +// magic coverity-only preprocessor thing. +#nodef BUG(x) ((x)?(__coverity_panic__(),1):0) +#endif + +#if defined(__COVERITY__) || defined(__clang_analyzer__) +// We're running with a static analysis tool: let's treat even nonfatal +// assertion failures as something that we need to avoid. +#define ALL_BUGS_ARE_FATAL +#endif + #ifdef ALL_BUGS_ARE_FATAL #define tor_assert_nonfatal_unreached() tor_assert(0) #define tor_assert_nonfatal(cond) tor_assert((cond))

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 004a125e14720b77d81eefb3c6e29a45c2353064 Merge: bb32475c0 0117e2ea0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 12:58:22 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug23030_029 | 7 +++++++ src/common/util_bug.h | 13 +++++++++++++ 2 files changed, 20 insertions(+)

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 18734d3b25f3a26fea3fd78e64136da9bcd3836d Merge: 3c017e823 0117e2ea0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 12:58:22 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23030_029 | 7 +++++++ src/common/util_bug.h | 13 +++++++++++++ 2 files changed, 20 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 8d3c3f039d89bf27cdb825fcb4806c9135597154 Merge: 8b5b3b5fb 431c8d09e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 12:58:22 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23030_029 | 7 +++++++ src/common/util_bug.h | 13 +++++++++++++ 2 files changed, 20 insertions(+)

1 0