diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-07 10:52:21 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-07 10:52:21 -0500 |
| commit | 9b37d540b05bf25de5ef82766d0228aee7979af0 (patch) | |
| tree | 52fd166290fe4b8750d76bbc21bd818df7453e53 | |
| parent | 99683ee561e065c4350e713eec3d2d8cd67325dd (diff) | |
| parent | d6ca36defa25e0d77718731924195cc244a18b11 (diff) | |
| download | tor-9b37d540b05bf25de5ef82766d0228aee7979af0.tar.gz tor-9b37d540b05bf25de5ef82766d0228aee7979af0.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -rw-r--r-- | changes/bug20710_025 | 4 | ||||
| -rw-r--r-- | src/common/sandbox.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changes/bug20710_025 b/changes/bug20710_025 new file mode 100644 index 0000000000..12bd07536c --- /dev/null +++ b/changes/bug20710_025 @@ -0,0 +1,4 @@ + o Minor bugfixes (memory leak, use-after-free, linux seccomp2 sandbox): + - Fix a memory leak and use-after-free error when removing entries + from the sandbox's getaddrinfo() cache. Fixes bug 20710; bugfix on + 0.2.5.5-alpha. Patch from "cypherpunks". diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 24ba8a2997..ebc843e130 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1579,13 +1579,14 @@ sandbox_add_addrinfo(const char *name) void sandbox_free_getaddrinfo_cache(void) { - cached_getaddrinfo_item_t **next, **item; + cached_getaddrinfo_item_t **next, **item, *this; for (item = HT_START(getaddrinfo_cache, &getaddrinfo_cache); item; item = next) { + this = *item; next = HT_NEXT_RMV(getaddrinfo_cache, &getaddrinfo_cache, item); - cached_getaddrinfo_item_free(*item); + cached_getaddrinfo_item_free(this); } HT_CLEAR(getaddrinfo_cache, &getaddrinfo_cache); |