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

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 8b685622f843d1d450bf87356aa7055964421dd4 Merge: 69d7ea4db b9d81282e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 08:06:54 2020 -0500 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug32877 | 4 ++++ src/lib/sandbox/sandbox.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit bdc870e6f5e6eb25f40644614ab5ad4479c9cb9d Merge: 8b685622f f5461a4bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 08:08:59 2020 -0500 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug32841 | 4 ++++ changes/bug32877 | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.1] update changes file to pass "make check-changes"
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit f5461a4bdf343a0572b0594fa33af37ce1be9d8f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 08:08:48 2020 -0500 update changes file to pass "make check-changes" --- changes/bug32841 | 4 ++++ changes/bug32877 | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/changes/bug32841 b/changes/bug32841 new file mode 100644 index 000000000..48568f6a6 --- /dev/null +++ b/changes/bug32841 @@ -0,0 +1,4 @@ + o Minor bugfixes (linux seccomp sandbox): + - Fix crash when reloading logging configuration while the + experimental sandbox is enabled. Fixes bug 32841; bugfix + on 0.4.1.7. Patch by Peter Gerber. diff --git a/changes/bug32877 b/changes/bug32877 deleted file mode 100644 index 96fe1af70..000000000 --- a/changes/bug32877 +++ /dev/null @@ -1,4 +0,0 @@ -o Minor bugfixes (linux seccomp sandbox): - - Fix crash when reloading logging configuration while the - experimental sandbox is enabled. Fixes bug 29150; bugfix - on 0.4.1.7. Patch by Peter Gerber.

1 0

[tor/release-0.4.2] Fix sandbox crash during reload of logging configuration
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit b9d81282e0dbfdae795b38c26879716d7860bcf9 Author: Peter Gerber <pgerber(a)tocco.ch> Date: Sun Jan 5 15:48:54 2020 +0100 Fix sandbox crash during reload of logging configuration Allow calls to dup() which was introduced in commit a22fbab986. From a security perspective, I don't think this should impact the security of the sandbox significantly. As far as I can tell, there is nothing an adversary can do with a duplicated FD that can't be done with the original. --- changes/bug32877 | 4 ++++ src/lib/sandbox/sandbox.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug32877 b/changes/bug32877 new file mode 100644 index 000000000..96fe1af70 --- /dev/null +++ b/changes/bug32877 @@ -0,0 +1,4 @@ +o Minor bugfixes (linux seccomp sandbox): + - Fix crash when reloading logging configuration while the + experimental sandbox is enabled. Fixes bug 29150; bugfix + on 0.4.1.7. Patch by Peter Gerber. diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index faaf463f2..7e6354d88 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -143,6 +143,7 @@ static int filter_nopar_gen[] = { SCMP_SYS(clock_gettime), SCMP_SYS(close), SCMP_SYS(clone), + SCMP_SYS(dup), SCMP_SYS(epoll_create), SCMP_SYS(epoll_wait), #ifdef __NR_epoll_pwait

1 0

[tor/release-0.4.2] update changes file to pass "make check-changes"
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit f5461a4bdf343a0572b0594fa33af37ce1be9d8f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 08:08:48 2020 -0500 update changes file to pass "make check-changes" --- changes/bug32841 | 4 ++++ changes/bug32877 | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/changes/bug32841 b/changes/bug32841 new file mode 100644 index 000000000..48568f6a6 --- /dev/null +++ b/changes/bug32841 @@ -0,0 +1,4 @@ + o Minor bugfixes (linux seccomp sandbox): + - Fix crash when reloading logging configuration while the + experimental sandbox is enabled. Fixes bug 32841; bugfix + on 0.4.1.7. Patch by Peter Gerber. diff --git a/changes/bug32877 b/changes/bug32877 deleted file mode 100644 index 96fe1af70..000000000 --- a/changes/bug32877 +++ /dev/null @@ -1,4 +0,0 @@ -o Minor bugfixes (linux seccomp sandbox): - - Fix crash when reloading logging configuration while the - experimental sandbox is enabled. Fixes bug 29150; bugfix - on 0.4.1.7. Patch by Peter Gerber.

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 7b7aa4f070565fda111991f0d49342c977e42f02 Merge: 664a2c075 16e94dc7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 08:06:54 2020 -0500 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug32877 | 4 ++++ src/lib/sandbox/sandbox.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 16e94dc7a70e90fe7a1617ffeef817f3394fe382 Merge: 5dbb607e9 b9d81282e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 08:06:54 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/bug32877 | 4 ++++ src/lib/sandbox/sandbox.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 2d8d6d1ebfd62ebc6da931170d949d8c02f67b76 Merge: 16e94dc7a f5461a4bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 08:08:59 2020 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/bug32841 | 4 ++++ changes/bug32877 | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 77188ef36e9163b87f89135ff459f21100614b1e Merge: 7b7aa4f07 2d8d6d1eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 08:08:59 2020 -0500 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug32841 | 4 ++++ changes/bug32877 | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/master] Fix spacing in tor_inet_aton() function header
by nickm＠torproject.org 06 Jan '20

06 Jan '20

commit 01c6fde3265752f8e91084f5d1dd4788a96d8de9 Author: Neel Chauhan <neel(a)neelc.org> Date: Fri Dec 20 14:10:43 2019 -0500 Fix spacing in tor_inet_aton() function header --- src/lib/net/inaddr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/net/inaddr.c b/src/lib/net/inaddr.c index d9ae7cd56..79529c047 100644 --- a/src/lib/net/inaddr.c +++ b/src/lib/net/inaddr.c @@ -35,7 +35,7 @@ * (Like inet_aton(str,addr), but works on Windows and Solaris.) */ int -tor_inet_aton(const char *str, struct in_addr* addr) +tor_inet_aton(const char *str, struct in_addr *addr) { unsigned a,b,c,d; char more;

1 0